X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fresources%2Frest_api%2Fct%2Fct.sh;h=fc69e8f7d4e42dee199912cec3fdeaaf3a78f209;hb=d8ece13fc2c7f6d649e4f0e9689006f1d02a54b2;hp=f51f0d1ee34d773f8f29dd6f9f2e2fe4a1926794;hpb=26c27c2b83f99e6df420addc90010eb0d4a7724e;p=anna.git

diff --git a/example/diameter/launcher/resources/rest_api/ct/ct.sh b/example/diameter/launcher/resources/rest_api/ct/ct.sh
index f51f0d1..fc69e8f 100755
--- a/example/diameter/launcher/resources/rest_api/ct/ct.sh
+++ b/example/diameter/launcher/resources/rest_api/ct/ct.sh
@@ -7,13 +7,12 @@
 REPO_DIR="$(git rev-parse --show-toplevel 2>/dev/null)"
 [ -z "$REPO_DIR" ] && { echo "You must execute under a valid git repository !" ; exit 1 ; }
 
-SERVICES=${REPO_DIR}/example/diameter/launcher/resources/rest_api/ct/resources/servicesJson-request.json
+SERVICES=${REPO_DIR}/example/diameter/launcher/resources/rest_api/ct/resources/servicesRxJson-request.json
 ENDPOINT=http://localhost:8074
 PORT=$(echo ${ENDPOINT} | cut -d: -f3)
-C_NAME=anna-adml-http
+SVC_NAME=anna-adml-http
 # Entrypoint arguments (ft/st):
 EXTRA_ARGUMENTS= # default is ft (function test: debug traces and traffic logs)
-EXTRA_ARGUMENTS=st
 
 VARIANT=${1:-Release}
 
@@ -34,22 +33,34 @@ nghttp --version 2>/dev/null
 echo "Requirement found !"
 
 echo
-echo "Rebuild ADML HTTP service image (y/n) [n]:"
+echo "Rebuild ADML HTTP service image (y/n) [y]:"
 read opt
-[ -z "${opt}" ] && opt=n
+[ -z "${opt}" ] && opt=y
 if [ "${opt}" = "y" ]
 then
   ${REPO_DIR}/tools/build-anna-adml-http ${VARIANT}
 fi
 
 version=$(${REPO_DIR}/tools/version)
-[ "${VARIANT}" = "Debug" ] && { version=${version}-debug ; C_NAME=${C_NAME}-debug ; }
-echo "Restart ADML HTTP service image (version '${version}') ..."
-docker kill ${C_NAME} &>/dev/null
-cid=$(docker run --rm -d -p ${PORT}:${PORT} --name ${C_NAME} anna-adml-http:${version} ${EXTRA_ARGUMENTS} >/dev/null)
-[ $? -ne 0 ] && exit 1
+cname=${SVC_NAME}
+[ "${VARIANT}" = "Debug" ] && { version=${version}-debug ; cname=${cname}-debug ; }
+echo "Restart ADML HTTP service image (version '${version}') (y/n) [y]:"
+read opt
+[ -z "${opt}" ] && opt=y
+if [ "${opt}" = "y" ]
+then
+  docker kill ${SVC_NAME} &>/dev/null
+  docker kill ${SVC_NAME}-debug &>/dev/null
 
-echo "Container id: ${cid} (deployed as '${C_NAME}')"
+  echo "Optimize for system test (disable traffic logs and set warning level for traces) (y/n) [n]:"
+  read opt
+  [ -z "${opt}" ] && opt=n
+  [ "${opt}" = "y" ] && EXTRA_ARGUMENTS=st
+
+  cid=$(docker run --rm -d -p ${PORT}:${PORT} --name ${cname} anna-adml-http:${version} ${EXTRA_ARGUMENTS} >/dev/null)
+  [ $? -ne 0 ] && exit 1
+  echo "Container id: ${cid} (deployed as '${cname}')"
+fi
 
 echo
 echo "Configuring services (${SERVICES}) ..."
@@ -68,7 +79,7 @@ echo
 echo -n "Waiting for server-client connection ..."
 while true
 do
-  docker exec -it ${C_NAME} bash -c "netstat -p \$(pgrep ADML) --numeric-ports | grep -w 3868 | grep -w ESTABLISHED" >/dev/null
+  docker exec -it ${cname} bash -c "netstat -p \$(pgrep ADML) --numeric-ports | grep -w 3868 | grep -w ESTABLISHED" >/dev/null
   [ $? -eq 0 ] && break
   echo -n .
   sleep 1