X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeployments%2Fst-client%2Fprogram.sh;h=030877134b9fa83e4b4fcb71676d3d8bfe5d7d7c;hb=a81d63214cae39da0522302ba8dfa68daef96709;hp=fccfe07443e68321ef60f7b8c79ec54ad7134d6c;hpb=18319deabbc8563fc112795968372e96263e6fe4;p=anna.git

diff --git a/example/diameter/launcher/deployments/st-client/program.sh b/example/diameter/launcher/deployments/st-client/program.sh
index fccfe07..0308771 100755
--- a/example/diameter/launcher/deployments/st-client/program.sh
+++ b/example/diameter/launcher/deployments/st-client/program.sh
@@ -22,12 +22,20 @@ _exit() {
 usage() {
   echo "Usage: $0 <test stuff directory> [-s]"
   echo
-  echo "       test stuff directory: contains msk files, specially a testcase description with xml files referenced."
-  echo "                             Those files, adding .msk extension, shall exists in the same directory. For example:"
+  echo "       Performs test case programming from scratch (current test cases will be dropped from ADML involved instances)."
+  echo
+  echo "       test stuff directory: contains msk files, specially a testcase file with xml files referenced inside. Those"
+  echo "                             xml files (without the .msk extension) shall exists in the directory. For example:"
+  echo
   echo "                                $0 st_examples/DynamicQualification"
   echo
+  echo "                             Optionally, a file called 'specific' could exists containing testcase-specific information,"
+  echo "                             which normally will be used to specify database sentences. This file will be accumulated"
+  echo "                             as a cloning seed over the file 'specific.all' created on test stuff directory."
+  echo
+  echo
   echo "       -s: start testing just after programming, using desired rate: $DESIRED_RATE test cases per second."
-  [ $ADML_INSTANCES -gt 1 ] && echo "           In your case, with $ADML_INSTANCES, a rate of $RATE_PER_INSTANCE ttps will be send per instance"
+  [ $ADML_INSTANCES -gt 1 ] && echo "           In your case, with $ADML_INSTANCES, a rate of $RATE_PER_INSTANCE ttps will be send per instance."
   echo
   _exit
 }
@@ -52,6 +60,8 @@ miss_conf=
 
 echo
 [ -z "$1" ] && usage
+./operation.sh --ping
+[ $? -ne 0 ] && _exit "Programming aborted (some ADML client process is not running) !"
 TESTCASE_DIR=$1
 AUTOSTART=$2
 
@@ -60,14 +70,20 @@ TESTCASE=( `ls $TESTCASE_DIR/testcase*msk 2>/dev/null` )
 TESTCASE_FILES=${#TESTCASE[@]}
 [ $TESTCASE_FILES -ne 1 ] && _exit "One and only one 'testcase*msk' file must be present !!"
 
+MAX_NUMBER_GROUPS=$(grep ^MAX_NUMBER_GROUPS= clone.sh | cut -d= -f2)
+CLONE_GROUPS=$((MAX_NUMBER_GROUPS/ADML_INSTANCES))
+#CLONE_GROUPS=1
+specific=
+[ -f $TESTCASE_DIR/specific ] && specific=specific
+
 children_before=$(children)
 while read -r line
 do
   instance=$(echo $line | awk '{ print $1 }')
   ini_seq=$(echo $line | awk '{ print $2 }')
   fin_seq=$(echo $line | awk '{ print $3 }')
-  ADML_DIR=`readlink -f ADMLS/$instance`
-  ./clone.sh $ADML_DIR $TESTCASE $ini_seq $fin_seq 1 &
+  ADML_DIR=`readlink -f ADMLS/ADML-$instance`
+  ./clone.sh $ADML_DIR $TESTCASE $ini_seq $fin_seq $CLONE_GROUPS $specific &
 
 done < $PROGRAM_LAYOUT_FILE
 
@@ -80,9 +96,24 @@ do
   sleep 1
 done
 
+echo
+echo "Programming has finished !"
+echo
+
 echo "Configuring repeat cycles ..."
 ./operation.sh "test|repeats|$REPEATS"
 
+if [ -n "$specific" ]
+then
+  echo "A new file '$TESTCASE_DIR/specific.all' has been created."
+  echo "Probably you need to apply it before starting traffic."
+  echo
+  echo "Press ENTER to continue, CTRL-C to abort ..."
+  read dummy
+fi
+
+echo
+echo
 start_testing=
 if [ "$AUTOSTART" = "-s" ]
 then
@@ -95,6 +126,9 @@ else
     rate_per_instance=$((desired_rate/$ADML_INSTANCES))
     [ $rate_per_instance -lt 1 ] && rate_per_instance=1
     ./operation.sh "test|ttps|$rate_per_instance"
+  else
+    echo "Remember that you could start traffic using:"
+    echo "   ./operation.sh \"test|ttps|<test cases per second rate>\""
   fi
 fi