X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fresources%2Fscripts%2FtinyTestcase.sh;h=5beaa12d7603a9d7ef7a33904443663e1d427a46;hb=127e9289b0f410f51a364ac887b6ab7ec58ec6d7;hp=bd1c733e7e208e884b2ac1699899747b7c67fabf;hpb=b024e74e517f6f2da26722bc258ec48532a2b15e;p=anna.git

diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase.sh b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
index bd1c733..5beaa12 100755
--- a/example/diameter/launcher/resources/scripts/tinyTestcase.sh
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
@@ -114,8 +114,16 @@ update_testcase () {
   if [ $isrequest -eq 1 ]
   then
     # Send the request
-    # Special case for SNR/SNA (code=8388636): the Session-Id is created on client and received on SLR previously
-    [ "$code" = "8388636" -a "$adml_type" = "server" ] && s_send="test|1|$send_command|$xml|$REQUEST_STEP"
+    # 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" ]
@@ -138,8 +146,15 @@ update_testcase () {
     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|||||$subscriber" ; REQUEST_STEP=$next_step_number ; }
+    # 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
 
     # Send the answer
@@ -185,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
@@ -217,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
@@ -234,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