Fix new variables

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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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 (file)
index 726b1ab..0000000
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.15.hex.as.xml.msk
+++ /dev/null
@@ -1,27 +0,0 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="15" end-by-end-id="143351">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;100000001"/>
-   <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
-   <avp name="Destination-Realm" data="operatorRealm.com"/>
-   <avp name="Origin-Host" data="ggsnNodeHostname.ggsnNodeHostRealm.com"/>
-   <avp name="Origin-Realm" data="ggsnNodeHostRealm.com"/>
-   <avp name="Auth-Application-Id" data="16777238"/>
-   <avp name="Origin-State-Id" data="1"/>
-   <avp name="CC-Request-Number" data="0"/>
-   <avp name="CC-Request-Type" data="1" alias="INITIAL_REQUEST"/>
-   <avp name="Framed-IP-Address" hex-data="00000001"/>
-   <avp name="Bearer-Usage" data="0" alias="GENERAL"/>
-   <avp name="Subscription-Id">
-      <avp name="Subscription-Id-Type" data="0" alias="END_USER_E164"/>
-      <avp name="Subscription-Id-Data" data="34600000001"/>
-   </avp>
-   <avp name="RAT-Type" data="1004" alias="EUTRAN"/>
-   <avp name="Called-Station-Id" data="defaultApnId"/>
-   <avp name="QoS-Negotiation" data="1" alias="QoS_NEGOTIATION_SUPPORTED"/>
-   <avp name="QoS-Upgrade" data="1" alias="QoS_UPGRADE_SUPPORTED"/>
-   <avp name="Supported-Features" flags="192">
-      <avp name="Vendor-Id" data="10415"/>
-      <avp code="629" vendor-code="10415" flags="192" data="1"/>
-      <avp code="630" vendor-code="10415" flags="192" data="11"/>
-   </avp>
-   <avp name="IP-CAN-Type" data="5" alias="3GPP-EPS"/>
-</message>

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 (file)
index 9d0543d..0000000
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.20.hex.as.xml.msk
+++ /dev/null
@@ -1,68 +0,0 @@
-<message version="1" name="AA-Request" application-id="16777236" hop-by-hop-id="20" end-by-end-id="163097">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;afNodeHostname.afNodeHostRealm.com;2;100000001"/>
-   <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
-   <avp name="Destination-Realm" data="operatorRealm.com"/>
-   <avp name="Origin-Host" data="afNodeHostname.afNodeHostRealm.com"/>
-   <avp name="Origin-Realm" data="afNodeHostRealm.com"/>
-   <avp name="Auth-Application-Id" data="16777236"/>
-   <avp name="Origin-State-Id" data="1"/>
-   <avp name="Framed-IP-Address" hex-data="00000001"/>
-   <avp name="AF-Application-Identifier" hex-data="75726e25334175726e2d787878253341336770702d736572766963652e696d732e696373692e6d6d74656c"/>
-   <avp name="Media-Component-Description">
-      <avp name="Media-Component-Number" data="1"/>
-      <avp name="Media-Sub-Component">
-         <avp name="Flow-Number" data="1"/>
-         <avp name="Flow-Description" data="permit in 17 from 0.0.0.1 2234 to 10.95.130.50 2234"/>
-         <avp name="Flow-Description" data="permit out 17 from 10.95.130.50 2234 to 0.0.0.1 2234"/>
-         <avp name="Flow-Status" data="2" alias="ENABLED"/>
-         <avp name="Flow-Usage" data="0" alias="NO_INFORMATION"/>
-      </avp>
-      <avp name="Media-Sub-Component">
-         <avp name="Flow-Number" data="2"/>
-         <avp name="Flow-Description" data="permit in 17 from 0.0.0.1 2235 to 10.95.130.50 2235"/>
-         <avp name="Flow-Description" data="permit out 17 from 10.95.130.50 2235 to 0.0.0.1 2235"/>
-         <avp name="Flow-Status" data="2" alias="ENABLED"/>
-         <avp name="Flow-Usage" data="1" alias="RTCP"/>
-      </avp>
-      <avp name="AF-Application-Identifier" hex-data="75726e25334175726e2d787878253341336770702d736572766963652e696d732e696373692e6d6d74656c"/>
-      <avp name="Media-Type" data="0" alias="OTHER"/>
-      <avp name="Max-Requested-Bandwidth-UL" data="128000"/>
-      <avp name="Max-Requested-Bandwidth-DL" data="128000"/>
-      <avp name="Flow-Status" data="2" alias="ENABLED"/>
-      <avp code="458" vendor-code="13019" flags="192" data="3" alias="PRIORITY-THREE"/>
-      <avp name="RR-Bandwidth" data="64000"/>
-      <avp name="RS-Bandwidth" data="64000"/>
-   </avp>
-   <avp name="Media-Component-Description">
-      <avp name="Media-Component-Number" data="2"/>
-      <avp name="Media-Sub-Component">
-         <avp name="Flow-Number" data="1"/>
-         <avp name="Flow-Description" data="permit in 17 from 0.0.0.1 2236 to 10.95.130.50 2236"/>
-         <avp name="Flow-Description" data="permit out 17 from 10.95.130.50 2236 to 0.0.0.1 2236"/>
-         <avp name="Flow-Status" data="2" alias="ENABLED"/>
-         <avp name="Flow-Usage" data="0" alias="NO_INFORMATION"/>
-      </avp>
-      <avp name="Media-Sub-Component">
-         <avp name="Flow-Number" data="2"/>
-         <avp name="Flow-Description" data="permit in 17 from 0.0.0.1 2237 to 10.95.130.50 2237"/>
-         <avp name="Flow-Description" data="permit out 17 from 10.95.130.50 2237 to 0.0.0.1 2237"/>
-         <avp name="Flow-Status" data="2" alias="ENABLED"/>
-         <avp name="Flow-Usage" data="1" alias="RTCP"/>
-      </avp>
-      <avp name="AF-Application-Identifier" hex-data="75726e25334175726e2d787878253341336770702d736572766963652e696d732e696373692e6d6d74656c"/>
-      <avp name="Media-Type" data="1" alias="VIDEO"/>
-      <avp name="Max-Requested-Bandwidth-UL" data="128000"/>
-      <avp name="Max-Requested-Bandwidth-DL" data="128000"/>
-      <avp name="Flow-Status" data="2" alias="ENABLED"/>
-      <avp code="458" vendor-code="13019" flags="192" data="4" alias="PRIORITY-FOUR"/>
-      <avp name="RR-Bandwidth" data="64000"/>
-      <avp name="RS-Bandwidth" data="64000"/>
-   </avp>
-   <avp name="AF-Charging-Identifier" hex-data="41462d4368617267696e674964656e746966696572"/>
-   <avp name="SIP-Forking-Indication" data="0" alias="SINGLE_DIALOGUE"/>
-   <avp name="Supported-Features" flags="192">
-      <avp name="Vendor-Id" data="10415"/>
-      <avp code="629" vendor-code="10415" flags="192" data="1"/>
-      <avp code="630" vendor-code="10415" flags="192" data="19"/>
-   </avp>
-</message>

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 (file)
index ec101b0..0000000
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.28.hex.as.xml.msk
+++ /dev/null
@@ -1,7 +0,0 @@
-<message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878460" end-by-end-id="3244878460">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;100000001"/>
-   <avp name="Origin-Host" data="ggsnNodeHostname.ggsnNodeHostRealm.com"/>
-   <avp name="Origin-Realm" data="ggsnNodeHostRealm.com"/>
-   <avp name="Result-Code" data="2001" alias="DIAMETER_SUCCESS"/>
-   <avp name="Origin-State-Id" data="1"/>
-</message>

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 (file)
index 42e6cd0..0000000
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.30.hex.as.xml.msk
+++ /dev/null
@@ -1,18 +0,0 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="30" end-by-end-id="3244878461">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;100000001"/>
-   <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
-   <avp name="Destination-Realm" data="operatorRealm.com"/>
-   <avp name="Origin-Host" data="ggsnNodeHostname.ggsnNodeHostRealm.com"/>
-   <avp name="Origin-Realm" data="ggsnNodeHostRealm.com"/>
-   <avp name="Auth-Application-Id" data="16777238"/>
-   <avp name="Origin-State-Id" data="1"/>
-   <avp name="CC-Request-Number" data="1"/>
-   <avp name="CC-Request-Type" data="2" alias="UPDATE_REQUEST"/>
-   <avp name="Bearer-Usage" data="0" alias="GENERAL"/>
-   <avp name="Subscription-Id">
-      <avp name="Subscription-Id-Type" data="0" alias="END_USER_E164"/>
-      <avp name="Subscription-Id-Data" data="34600000001"/>
-   </avp>
-   <avp name="RAT-Type" data="1004" alias="EUTRAN"/>
-   <avp name="IP-CAN-Type" data="6" alias="Non-3GPP-EPS"/>
-</message>

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 (file)
index 1f54e3a..0000000
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.35.hex.as.xml.msk
+++ /dev/null
@@ -1,10 +0,0 @@
-<message version="1" name="ST-Request" application-id="16777236" hop-by-hop-id="35" end-by-end-id="163097">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;afNodeHostname.afNodeHostRealm.com;2;100000001"/>
-   <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
-   <avp name="Destination-Realm" data="operatorRealm.com"/>
-   <avp name="Origin-Host" data="afNodeHostname.afNodeHostRealm.com"/>
-   <avp name="Origin-Realm" data="afNodeHostRealm.com"/>
-   <avp name="Auth-Application-Id" data="16777236"/>
-   <avp name="Origin-State-Id" data="1"/>
-   <avp name="Termination-Cause" data="1" alias="LOGOUT"/>
-</message>

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 (file)
index ac0a303..0000000
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.39.hex.as.xml.msk
+++ /dev/null
@@ -1,7 +0,0 @@
-<message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878461" end-by-end-id="3244878461">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;100000001"/>
-   <avp name="Origin-Host" data="ggsnNodeHostname.ggsnNodeHostRealm.com"/>
-   <avp name="Origin-Realm" data="ggsnNodeHostRealm.com"/>
-   <avp name="Result-Code" data="2001" alias="DIAMETER_SUCCESS"/>
-   <avp name="Origin-State-Id" data="1"/>
-</message>

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 (file)
index 152ad13..0000000
--- a/example/diameter/launcher/resources/st_examples/DynamicQualification/1.41.hex.as.xml.msk
+++ /dev/null
@@ -1,18 +0,0 @@
-<message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="41" end-by-end-id="3244878462">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;100000001"/>
-   <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
-   <avp name="Destination-Realm" data="operatorRealm.com"/>
-   <avp name="Origin-Host" data="ggsnNodeHostname.ggsnNodeHostRealm.com"/>
-   <avp name="Origin-Realm" data="ggsnNodeHostRealm.com"/>
-   <avp name="Auth-Application-Id" data="16777238"/>
-   <avp name="Origin-State-Id" data="1"/>
-   <avp name="CC-Request-Number" data="2"/>
-   <avp name="CC-Request-Type" data="3" alias="TERMINATION_REQUEST"/>
-   <avp name="Bearer-Usage" data="0" alias="GENERAL"/>
-   <avp name="Subscription-Id">
-      <avp name="Subscription-Id-Type" data="0" alias="END_USER_E164"/>
-      <avp name="Subscription-Id-Data" data="34600000001"/>
-   </avp>
-   <avp name="RAT-Type" data="1004" alias="EUTRAN"/>
-   <avp name="Termination-Cause" data="1" alias="LOGOUT"/>
-</message>

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 (file)
--- 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 @@
 <message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="15" end-by-end-id="143351">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;__SGX1_SUFFIX__"/>
+   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
    <avp name="Origin-Host" data="ggsnNodeHostname.ggsnNodeHostRealm.com"/>
@@ -12,7 +12,7 @@
    <avp name="Bearer-Usage" data="0" alias="GENERAL"/>
    <avp name="Subscription-Id">
       <avp name="Subscription-Id-Type" data="0" alias="END_USER_E164"/>
-      <avp name="Subscription-Id-Data" data="34__MSISDN9__"/>
+      <avp name="Subscription-Id-Data" data="346__SEQ8__"/>
    </avp>
    <avp name="RAT-Type" data="1004" alias="EUTRAN"/>
    <avp name="Called-Station-Id" data="defaultApnId"/>

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 (file)
--- 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 @@
 <message version="1" name="AA-Request" application-id="16777236" hop-by-hop-id="20" end-by-end-id="163097">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;afNodeHostname.afNodeHostRealm.com;2;__SRX1_SUFFIX__"/>
+   <avp name="Session-Id" data="MMTel_DynamicQualification;afNodeHostname.afNodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
    <avp name="Origin-Host" data="afNodeHostname.afNodeHostRealm.com"/>

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 (file)
--- 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 @@
 <message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878460" end-by-end-id="3244878460">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;__SGX1_SUFFIX__"/>
+   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Origin-Host" data="ggsnNodeHostname.ggsnNodeHostRealm.com"/>
    <avp name="Origin-Realm" data="ggsnNodeHostRealm.com"/>
    <avp name="Result-Code" data="2001" alias="DIAMETER_SUCCESS"/>

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 (file)
--- 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 @@
 <message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="30" end-by-end-id="3244878461">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;__SGX1_SUFFIX__"/>
+   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
    <avp name="Origin-Host" data="ggsnNodeHostname.ggsnNodeHostRealm.com"/>
@@ -11,7 +11,7 @@
    <avp name="Bearer-Usage" data="0" alias="GENERAL"/>
    <avp name="Subscription-Id">
       <avp name="Subscription-Id-Type" data="0" alias="END_USER_E164"/>
-      <avp name="Subscription-Id-Data" data="34__MSISDN9__"/>
+      <avp name="Subscription-Id-Data" data="346__SEQ8__"/>
    </avp>
    <avp name="RAT-Type" data="1004" alias="EUTRAN"/>
    <avp name="IP-CAN-Type" data="6" alias="Non-3GPP-EPS"/>

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 (file)
--- 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 @@
 <message version="1" name="ST-Request" application-id="16777236" hop-by-hop-id="35" end-by-end-id="163097">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;afNodeHostname.afNodeHostRealm.com;2;__SRX1_SUFFIX__"/>
+   <avp name="Session-Id" data="MMTel_DynamicQualification;afNodeHostname.afNodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
    <avp name="Origin-Host" data="afNodeHostname.afNodeHostRealm.com"/>

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 (file)
--- 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 @@
 <message version="1" name="RA-Answer" p-bit="yes" application-id="16777238" hop-by-hop-id="3244878461" end-by-end-id="3244878461">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;__SGX1_SUFFIX__"/>
+   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Origin-Host" data="ggsnNodeHostname.ggsnNodeHostRealm.com"/>
    <avp name="Origin-Realm" data="ggsnNodeHostRealm.com"/>
    <avp name="Result-Code" data="2001" alias="DIAMETER_SUCCESS"/>

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 (file)
--- 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 @@
 <message version="1" name="CC-Request" application-id="16777238" hop-by-hop-id="41" end-by-end-id="3244878462">
-   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;__SGX1_SUFFIX__"/>
+   <avp name="Session-Id" data="MMTel_DynamicQualification;ggsnNodeHostname.ggsnNodeHostRealm.com;2;1__SEQ8__"/>
    <avp name="Destination-Host" data="ownHostId.operatorRealm.com"/>
    <avp name="Destination-Realm" data="operatorRealm.com"/>
    <avp name="Origin-Host" data="ggsnNodeHostname.ggsnNodeHostRealm.com"/>
@@ -11,7 +11,7 @@
    <avp name="Bearer-Usage" data="0" alias="GENERAL"/>
    <avp name="Subscription-Id">
       <avp name="Subscription-Id-Type" data="0" alias="END_USER_E164"/>
-      <avp name="Subscription-Id-Data" data="34__MSISDN9__"/>
+      <avp name="Subscription-Id-Data" data="346__SEQ8__"/>
    </avp>
    <avp name="RAT-Type" data="1004" alias="EUTRAN"/>
    <avp name="Termination-Cause" data="1" alias="LOGOUT"/>

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 (file)
--- 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