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

diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase.sh b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
index 59fb379..23ec5a4 100755
--- a/example/diameter/launcher/resources/scripts/tinyTestcase.sh
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
@@ -6,6 +6,7 @@
 SCR_DIR=`readlink -f $0 | xargs dirname`
 TESTCASE_BN=testcase.txt
 WHAT=?????????
+REQUEST_STEP=
 
 #############
 # FUNCTIONS #
@@ -92,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):
@@ -106,11 +109,27 @@ 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"
+
   if [ $isrequest -eq 1 ]
   then
-    echo "test|1|$send_command|$xml" >> $TESTCASE_BN
+    # Send the request
+    # Special case for SNR/SNA (code=8388636) and STR (code=275) going to SAPC: the Session-Id is created on client and received on SLR previously
+    if [ "$adml_type" = "server" ]
+    then
+      if [ "$code" = "8388636" -o "$code" = "275" ]
+      then
+        s_send="test|1|$send_command|$xml|$REQUEST_STEP"
+        s_wait="test|1|$wait_command|$code|0|||"
+      fi
+    fi
+
+    echo "$s_send" >> $TESTCASE_BN
+
     if [ -n "$resultcode" ]
     then
       local hbh="$(grep -o "hop-by-hop-id=\"[0-9]*\"" $xml)"
@@ -122,12 +141,29 @@ update_testcase () {
         _rc=$(getResultCode $ans_xml)
         [ -n "$_rc" ] && rc=$_rc
       fi
+
+      # 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))
+
+    # Wait the request
+    # Special case for SLR/SLA (code=8388635) and STR (code=275) coming from SAPC: the Session-Id is created on client
+    if [ "$adml_type" = "server" ]
+    then
+      if [ "$code" = "8388635" -o "$code" = "275" ]
+      then
+        s_wait="test|1|$wait_command|$code|1"
+        REQUEST_STEP=$next_step_number
+      fi
+    fi
     echo "$s_wait" >> $TESTCASE_BN
-    echo "test|1|$send_command|$xml|$((lines+1))" >> $TESTCASE_BN
+
+    # Send the answer
+    echo "test|1|$send_command|$xml|$next_step_number" >> $TESTCASE_BN
   fi
 }
 
@@ -169,8 +205,8 @@ sort .involved_frames > .involved_frames_sort
 mv .involved_frames_sort .involved_frames
 
 # Messages classification:
-0> cers_4_starting
-0> ceas_4_establishing
+#0> cers_4_starting
+#0> ceas_4_establishing
 0> cers_4_starting_origin_hosts
 0> ceas_4_establishing_origin_hosts
 0> requests_4_sending
@@ -178,7 +214,7 @@ mv .involved_frames_sort .involved_frames
 0> $TESTCASE_BN
 
 # Optional timeout:
-TIMEOUT_SEC=$3
+TIMEOUT_SEC=$2
 [ -n "$TIMEOUT_SEC" ] && echo "test|1|timeout|$((TIMEOUT_SEC * 1000))" >> $TESTCASE_BN
 
 # Process frames:
@@ -201,7 +237,7 @@ do
     grep -q "^code=257$" $mtd
     if [ $? -eq 0 ]
     then
-      echo $frame >> cers_4_starting
+      #echo $frame >> cers_4_starting
       [ -z "$originHost" ] &&  _exit "Missing Origin-Host (frame $frame, CER message) !!"
       echo "$originHost" >> cers_4_starting_origin_hosts
       ln -sf $xml cer.${originHost}.xml
@@ -218,7 +254,7 @@ do
     grep -q "^code=257$" $mtd
     if [ $? -eq 0 ]
     then
-      echo $frame >> ceas_4_establishing
+      #echo $frame >> ceas_4_establishing
       originHost=$(grep ^originhost= ${frame}.metadata | cut -d= -f2-)
       [ -z "$originHost" ] &&  _exit "Missing Origin-Host (frame $frame, CEA message) !!"
       echo "$originHost" >> ceas_4_establishing_origin_hosts
@@ -267,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"/>
@@ -290,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"/>