X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fresources%2Fscripts%2FtinyTestcase.sh;h=23ec5a4064b4d534dde8d5606b01d6e6b83bc45d;hp=5beaa12d7603a9d7ef7a33904443663e1d427a46;hb=9fa68da11c56250017da9735e4a5dd3fd3b2021b;hpb=d30d9e082885e16f0098a699a3b79f53fb28910b

diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase.sh b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
index 5beaa12..23ec5a4 100755
--- a/example/diameter/launcher/resources/scripts/tinyTestcase.sh
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
@@ -93,8 +93,10 @@ update_testcase () {
   local adml_type=$4
 
   local wait_command=waitfe
+  # wait xml variant:
+  local waitxml_command=waitfe-xml
   local send_command=sendxml2e
-  [ "$adml_type" = "server" ] && { wait_command=waitfc ; send_command=sendxml2c ; }
+  [ "$adml_type" = "server" ] && { wait_command=waitfc ; waitxml_command=waitfc-xml ; send_command=sendxml2c ; }
 
 
   # Ignore disconnect peer messages on testcase format (they have no session-id):
@@ -107,6 +109,8 @@ update_testcase () {
   local lines=$(wc -l $TESTCASE_BN | awk '{ print $1 }')
 
   local s_wait="test|1|$wait_command|$code|$((1-isrequest))"
+  # wait xml variant:
+  local s_waitxml="test|1|$waitxml_command|$xml"
   [ -n "$sessionid" ] && s_wait="${s_wait}|||${sessionid}"
 
   local s_send="test|1|$send_command|$xml"
@@ -141,7 +145,8 @@ update_testcase () {
       # Wait the answer:
       s_wait="${s_wait}|${rc}"
     fi
-    echo "$s_wait" >> $TESTCASE_BN
+    echo "$s_waitxml" >> $TESTCASE_BN
+    echo "#$s_wait" >> $TESTCASE_BN
   else
     local next_step_number=$((lines+1))
 
@@ -298,7 +303,7 @@ do
     echo $oh >> cers_4_starting_origin_hosts
     echo "Missing CER: `basename $cer` (a basic template has been created, please edit & fix the unknowns)"
         cat << EOF > $cer
-<message version="1" name="CER" application-id="0" hop-by-hop-id="1" end-by-end-id="1">
+<message version="1" name="CER" application-id="0" hop-by-hop-id="1" end-to-end-id="1">
    <avp name="Origin-Host" data="$oh"/>
    <avp name="Origin-Realm" data="$(echo $oh | cut -d\. -f2-) $WHAT"/>
    <avp name="Auth-Application-Id" data="16777236 $WHAT 16777238 $WHAT"/>
@@ -321,7 +326,7 @@ do
     echo $oh >> ceas_4_establishing_origin_hosts
     echo "Missing CEA: `basename $cea` (a basic template has been created, please edit & fix the unknowns)"
         cat << EOF > $cea
-<message version="1" name="CEA" application-id="0" hop-by-hop-id="1" end-by-end-id="1">
+<message version="1" name="CEA" application-id="0" hop-by-hop-id="1" end-to-end-id="1">
    <avp name="Result-Code" data="2001" alias="DIAMETER_SUCCESS"/>
    <avp name="Origin-Host" data="$oh"/>
    <avp name="Origin-Realm" data="$(echo $oh | cut -d\. -f2-) $WHAT"/>