From ec48516a195faabbb514298ad743520b3fdb7ee4 Mon Sep 17 00:00:00 2001 From: Eduardo Ramos Testillano Date: Mon, 23 Nov 2015 17:11:53 +0100 Subject: [PATCH] Fix new variables --- .../deployments/st-client/operation_all.sh | 4 +- .../launcher/deployments/st-client/program.sh | 9 +-- .../launcher/resources/scripts/clone.sh | 2 +- .../DynamicQualification/1.15.hex.as.xml.msk | 27 -------- .../DynamicQualification/1.20.hex.as.xml.msk | 68 ------------------- .../DynamicQualification/1.28.hex.as.xml.msk | 7 -- .../DynamicQualification/1.30.hex.as.xml.msk | 18 ----- .../DynamicQualification/1.35.hex.as.xml.msk | 10 --- .../DynamicQualification/1.39.hex.as.xml.msk | 7 -- .../DynamicQualification/1.41.hex.as.xml.msk | 18 ----- .../DynamicQualification/15.hex.as.xml.msk | 4 +- .../DynamicQualification/20.hex.as.xml.msk | 2 +- .../DynamicQualification/28.hex.as.xml.msk | 2 +- .../DynamicQualification/30.hex.as.xml.msk | 4 +- .../DynamicQualification/35.hex.as.xml.msk | 2 +- .../DynamicQualification/39.hex.as.xml.msk | 2 +- .../DynamicQualification/41.hex.as.xml.msk | 4 +- .../DynamicQualification/testcase.txt.msk | 14 ++-- 18 files changed, 26 insertions(+), 178 deletions(-) delete mode 100644 example/diameter/launcher/resources/st_examples/DynamicQualification/1.15.hex.as.xml.msk delete mode 100644 example/diameter/launcher/resources/st_examples/DynamicQualification/1.20.hex.as.xml.msk delete mode 100644 example/diameter/launcher/resources/st_examples/DynamicQualification/1.28.hex.as.xml.msk delete mode 100644 example/diameter/launcher/resources/st_examples/DynamicQualification/1.30.hex.as.xml.msk delete mode 100644 example/diameter/launcher/resources/st_examples/DynamicQualification/1.35.hex.as.xml.msk delete mode 100644 example/diameter/launcher/resources/st_examples/DynamicQualification/1.39.hex.as.xml.msk delete mode 100644 example/diameter/launcher/resources/st_examples/DynamicQualification/1.41.hex.as.xml.msk diff --git a/example/diameter/launcher/deployments/st-client/operation_all.sh b/example/diameter/launcher/deployments/st-client/operation_all.sh index 616814d..7d9eeb0 100755 --- a/example/diameter/launcher/deployments/st-client/operation_all.sh +++ b/example/diameter/launcher/deployments/st-client/operation_all.sh @@ -10,7 +10,9 @@ fi for op in `ls ADMLS/*/operation.sh` do - cd `dirname $op` + dn_op=`dirname $op` + cd $dn_op + echo -n "Instance `basename $dn_op`: " ./operation.sh $@ cd - >/dev/null done diff --git a/example/diameter/launcher/deployments/st-client/program.sh b/example/diameter/launcher/deployments/st-client/program.sh index 93cd866..f3aa539 100755 --- a/example/diameter/launcher/deployments/st-client/program.sh +++ b/example/diameter/launcher/deployments/st-client/program.sh @@ -60,10 +60,9 @@ 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 !!" -#CLONE_GROUPS=1 -MAX_NUMBER_GROUPS=$(grep ^MAX_NUMBER_GROUPS= clone.sh | cut -d= -f2) -ADML_INSTANCES=`cat .st_conf_adml_instances` -CLONE_GROUPS=$((MAX_NUMBER_GROUPS/ADML_INSTANCES)) +#MAX_NUMBER_GROUPS=$(grep ^MAX_NUMBER_GROUPS= clone.sh | cut -d= -f2) +#CLONE_GROUPS=$((MAX_NUMBER_GROUPS/ADML_INSTANCES)) +CLONE_GROUPS=1 children_before=$(children) while read -r line @@ -92,6 +91,8 @@ echo echo "Configuring repeat cycles ..." ./operation.sh "test|repeats|$REPEATS" +echo +echo start_testing= if [ "$AUTOSTART" = "-s" ] then diff --git a/example/diameter/launcher/resources/scripts/clone.sh b/example/diameter/launcher/resources/scripts/clone.sh index 784185a..ad89977 100755 --- a/example/diameter/launcher/resources/scripts/clone.sh +++ b/example/diameter/launcher/resources/scripts/clone.sh @@ -16,7 +16,7 @@ _exit (){ echo # Background jobs: - kill -9 $(jobs -p) + kill -9 $(jobs -p) >/dev/null 2>/dev/null # Cleanup: rm -rf $CLONE_WKDIR diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.15.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/1.15.hex.as.xml.msk deleted file mode 100644 index 726b1ab..0000000 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.15.hex.as.xml.msk +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.20.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/1.20.hex.as.xml.msk deleted file mode 100644 index 9d0543d..0000000 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.20.hex.as.xml.msk +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.28.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/1.28.hex.as.xml.msk deleted file mode 100644 index ec101b0..0000000 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.28.hex.as.xml.msk +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.30.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/1.30.hex.as.xml.msk deleted file mode 100644 index 42e6cd0..0000000 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.30.hex.as.xml.msk +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.35.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/1.35.hex.as.xml.msk deleted file mode 100644 index 1f54e3a..0000000 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.35.hex.as.xml.msk +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.39.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/1.39.hex.as.xml.msk deleted file mode 100644 index ac0a303..0000000 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.39.hex.as.xml.msk +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.41.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/1.41.hex.as.xml.msk deleted file mode 100644 index 152ad13..0000000 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.41.hex.as.xml.msk +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/15.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/15.hex.as.xml.msk index dc7332d..2db4d52 100644 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/15.hex.as.xml.msk +++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/15.hex.as.xml.msk @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/20.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/20.hex.as.xml.msk index 0b4129c..2bf8abf 100644 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/20.hex.as.xml.msk +++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/20.hex.as.xml.msk @@ -1,5 +1,5 @@ - + diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/28.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/28.hex.as.xml.msk index 92d6388..07d63c8 100644 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/28.hex.as.xml.msk +++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/28.hex.as.xml.msk @@ -1,5 +1,5 @@ - + diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/30.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/30.hex.as.xml.msk index 6e53c57..09011ff 100644 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/30.hex.as.xml.msk +++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/30.hex.as.xml.msk @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/35.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/35.hex.as.xml.msk index 31a4d35..8b102e6 100644 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/35.hex.as.xml.msk +++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/35.hex.as.xml.msk @@ -1,5 +1,5 @@ - + diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/39.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/39.hex.as.xml.msk index b229433..9ac9403 100644 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/39.hex.as.xml.msk +++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/39.hex.as.xml.msk @@ -1,5 +1,5 @@ - + diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/41.hex.as.xml.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/41.hex.as.xml.msk index 242a779..1f1cda2 100644 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/41.hex.as.xml.msk +++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/41.hex.as.xml.msk @@ -1,5 +1,5 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/example/diameter/launcher/resources/st_examples/DynamicQualification/testcase.txt.msk b/example/diameter/launcher/resources/st_examples/DynamicQualification/testcase.txt.msk index b215519..8edeaf1 100644 --- a/example/diameter/launcher/resources/st_examples/DynamicQualification/testcase.txt.msk +++ b/example/diameter/launcher/resources/st_examples/DynamicQualification/testcase.txt.msk @@ -2,16 +2,16 @@ test|__TESTID__|delay|0 test|__TESTID__|delay|0 test|__TESTID__|delay|0 test|__TESTID__|sendxml2e|15.hex.as.xml -test|__TESTID__|waitfe|272|0|||MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;__SGX1_SUFFIX__|2001 +test|__TESTID__|waitfe|272|0|||MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;1__SEQ8__|2001 test|__TESTID__|sendxml2e|20.hex.as.xml -test|__TESTID__|waitfe|265|0|||MMTel_DynamicQualification;afNodeHostname.afNodeHostRealm.com;2;__SRX1_SUFFIX__|2001 -test|__TESTID__|waitfe|258|1|||MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;__SGX1_SUFFIX__ +test|__TESTID__|waitfe|265|0|||MMTel_DynamicQualification;afNodeHostname.afNodeHostRealm.com;2;1__SEQ8__|2001 +test|__TESTID__|waitfe|258|1|||MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;1__SEQ8__ test|__TESTID__|sendxml2e|28.hex.as.xml|8 test|__TESTID__|sendxml2e|30.hex.as.xml -test|__TESTID__|waitfe|272|0|||MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;__SGX1_SUFFIX__|2001 +test|__TESTID__|waitfe|272|0|||MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;1__SEQ8__|2001 test|__TESTID__|sendxml2e|35.hex.as.xml -test|__TESTID__|waitfe|275|0|||MMTel_DynamicQualification;afNodeHostname.afNodeHostRealm.com;2;__SRX1_SUFFIX__|2001 -test|__TESTID__|waitfe|258|1|||MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;__SGX1_SUFFIX__ +test|__TESTID__|waitfe|275|0|||MMTel_DynamicQualification;afNodeHostname.afNodeHostRealm.com;2;1__SEQ8__|2001 +test|__TESTID__|waitfe|258|1|||MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;1__SEQ8__ test|__TESTID__|sendxml2e|39.hex.as.xml|14 test|__TESTID__|sendxml2e|41.hex.as.xml -test|__TESTID__|waitfe|272|0|||MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;__SGX1_SUFFIX__|2001 +test|__TESTID__|waitfe|272|0|||MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;1__SEQ8__|2001 -- 2.20.1