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 22e2748..6de9452 100755 (executable)
--- a/example/diameter/launcher/resources/scripts/tinyTestcase.sh
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
@@ -115,7 +115,12 @@ update_testcase () {
   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"
+    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" ]
@@ -139,7 +144,7 @@ update_testcase () {
 
     # 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 ; }
+    [ "$code" = "8388635" -a "$adml_type" = "server" ] && { s_wait="test|1|$wait_command|$code|1" ; REQUEST_STEP=$next_step_number ; }
     echo "$s_wait" >> $TESTCASE_BN
 
     # Send the answer
@@ -185,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
@@ -217,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
@@ -234,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