No need for cers_4_starting and ceas_4_establishing

[anna.git] / example / diameter / launcher / resources / scripts / tinyTestcase.sh

diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase.sh b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
index 24046b1..6de9452 100755 (executable)
--- 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 #
@@ -108,9 +109,20 @@ update_testcase () {
   local s_wait="test|1|$wait_command|$code|$((1-isrequest))"
   [ -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): the Session-Id is created on client and received on SLR previously
+    if [ "$code" = "8388636" -a "$adml_type" = "server" ]
+    then
+      s_send="test|1|$send_command|$xml|$REQUEST_STEP"
+      s_wait="test|1|$wait_command|$code|0"
+    fi
+
+    echo "$s_send" >> $TESTCASE_BN
+
     if [ -n "$resultcode" ]
     then
       local hbh="$(grep -o "hop-by-hop-id=\"[0-9]*\"" $xml)"
@@ -122,12 +134,21 @@ 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
   else
+    local next_step_number=$((lines+1))
+
+    # Wait the request
+    # Special case for SLR/SLA (code=8388635): the Session-Id is created on client
+    [ "$code" = "8388635" -a "$adml_type" = "server" ] && { s_wait="test|1|$wait_command|$code|1" ; REQUEST_STEP=$next_step_number ; }
     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 +190,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
@@ -201,7 +222,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 +239,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