X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeployments%2Fst-client%2FcheckStatus.sh;h=7fb60cd4fdc53eddea26a2fae4c0b3acfa929216;hb=43e1ef25edd9bd4d3de10f24ffc6a8381b3f1f73;hp=7e7f8610465074f22c2f5b7f23da6572aea1383f;hpb=d723d5bf571eb48c641b092058eaa38bb6c4fcc8;p=anna.git

diff --git a/example/diameter/launcher/deployments/st-client/checkStatus.sh b/example/diameter/launcher/deployments/st-client/checkStatus.sh
index 7e7f861..7fb60cd 100755
--- a/example/diameter/launcher/deployments/st-client/checkStatus.sh
+++ b/example/diameter/launcher/deployments/st-client/checkStatus.sh
@@ -4,9 +4,19 @@ ADML_CONNECTIONS=`cat .st_conf_adml_connections 2>/dev/null`
 ADML_INSTANCES=`cat .st_conf_adml_instances 2>/dev/null`
 RESULT_CODE=0
 
-ADML_INSTANCES_ALIVE=$(pgrep ADML- | wc -l)
+cd $(dirname $0)
+if [ -z "$ADML_CONNECTIONS" -o -z "$ADML_INSTANCES" ]
+then
+  echo
+  echo "Run './configure.sh' first !"
+  echo
+  exit 3
+fi
+
+echo -n "Checking instances ... "
+ADML_INSTANCES_ALIVE=$(pgrep "ADML-[0-9]" | wc -l)
 echo -n "$ADML_INSTANCES_ALIVE instances alive"
-if [ $ADML_INSTANCES_ALIVE -ne $ADML_INSTANCES ]
+if [ $ADML_INSTANCES_ALIVE -lt $ADML_INSTANCES ]
 then
   echo " ! (expected $ADML_INSTANCES configured)"
   RESULT_CODE=1
@@ -14,9 +24,11 @@ else
   echo
 fi
 
-ADML_CONNECTIONS_ALIVE=$(netstat -a | grep :diameter | grep ESTABLISHED | wc -l)
+cmd="netstat -a | grep :diameter | grep ESTABLISHED | wc -l"
+echo -n "Checking connections ... "
+ADML_CONNECTIONS_ALIVE=$(eval $cmd)
 ADML_TOTAL_CONNECTIONS=$((ADML_CONNECTIONS*ADML_INSTANCES))
-echo -n "$ADML_CONNECTIONS_ALIVE connections established"
+echo -n "$ADML_CONNECTIONS_ALIVE connections established (using '$cmd')"
 if [ $ADML_CONNECTIONS_ALIVE -ne $ADML_TOTAL_CONNECTIONS ]
 then
   echo " ! (expected $ADML_TOTAL_CONNECTIONS configured)"
@@ -25,5 +37,10 @@ else
   echo
 fi
 
+echo
+echo "Check CEAs doing something like this:"
+echo "   ./operation.sh show-oam | grep CEAReceived | grep AccumulatedAmount > ceas.txt; cat ceas.txt | cut -d\\\" -f12 | paste -sd+ | bc"
+echo
+
 exit $RESULT_CODE