X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fresources%2Fscripts%2FtinyTestcase.sh;h=5beaa12d7603a9d7ef7a33904443663e1d427a46;hb=c69e6b4c2e243af7126034e9c037eb87d63e5e8a;hp=519443da0f14b0bd78c3a946f98702822ebf393b;hpb=7b0a04c86f78788d7083ade3fa08b3ab29b9cc1c;p=anna.git

diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase.sh b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
index 519443d..5beaa12 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 #
@@ -24,7 +25,7 @@ usage() {
   echo "       source_directory:"
   echo "         The source directory may contain .xml and .metadata files grouped by pairs and alphabetically classified,"
   echo "         and also (and this is VERY IMPORTANT), a file called 'origin-hosts' containing a list of Origin-Host"
-  echo "         values that are used from the point of view of the ADML testing system, together with the type of the"
+  echo "         values that represents the point of view of the ADML testing system, together with the type of the"
   echo "         simulated ADML node (client/server):"
   echo
   echo "            <id>.hex.as.xml: ANNA-Diameter XML message format."
@@ -108,9 +109,23 @@ 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) 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 +137,28 @@ 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) 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 +200,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 +209,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 +232,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 +249,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