Fix script for Sy

diff --git a/example/diameter/launcher/resources/scripts/tinyTestcase.sh b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
index c4f4db9..519443d 100755 (executable)
--- a/example/diameter/launcher/resources/scripts/tinyTestcase.sh
+++ b/example/diameter/launcher/resources/scripts/tinyTestcase.sh
@@ -152,16 +152,21 @@ awk '{ print $NF }' $ohs_file | egrep -qw 'client|server'
 [ ${PIPESTATUS[1]} -ne 0 ] && _exit "Can't found any Origin-Host in '$ohs_file' with a valid ADML node role value (client or server) !!"
 
 # Identify useful frames: those which are created at test-bed side (all except frames coming from tested systems):
-rm -f *.needed
+0> .involved_frames
+0> .involved_origin_hosts
+n_involved_frames=0
 for oh in `awk '{ print $1 }' $ohs_file`
 do
   for frame in $(grep -l "^originhost=$oh$" *.*metadata | cut -d\. -f1)
   do
-    touch ${frame}.needed
+    echo "$frame" >> .involved_frames
+    echo "$oh" >> .involved_origin_hosts
+    n_involved_frames=$((n_involved_frames + 1))
   done
 done
-ls *.needed >/dev/null 2>/dev/null
-[ $? -ne 0 ] && _exit "No frame has been selected within '$SOURCE_DIR' for provided origin-hosts file !!"
+[ $n_involved_frames -eq 0 ] && _exit "No frame has been selected within '$SOURCE_DIR' for provided origin-hosts file !!"
+sort .involved_frames > .involved_frames_sort
+mv .involved_frames_sort .involved_frames
 
 # Messages classification:
 0> cers_4_starting
@@ -177,7 +182,7 @@ TIMEOUT_SEC=$3
 [ -n "$TIMEOUT_SEC" ] && echo "test|1|timeout|$((TIMEOUT_SEC * 1000))" >> $TESTCASE_BN
 
 # Process frames:
-for frame in `ls *.needed | cut -d\. -f1 | sort -n`
+for frame in `cat .involved_frames`
 do
   mtd=( `ls ${frame}.*metadata 2>/dev/null` )
   [ ${#mtd[@]} -ne 1 ] && _exit "There must be one metadata file corresponding to frame '$frame' !!"
@@ -228,22 +233,15 @@ do
     update_testcase $mtd $xml "" $adml_type
   fi
 done
-rm -f *.needed
 
 
 # We will replace all the requests hop-by-hop's with a unique value, to avoid bad sniffing cases (different sources using bad values).
 # For example, the frame number could be valid enough.
 hbh_ini=
 hbh_fin=
-# involved frames:
-involved_xmls=
-grep "|sendxml" $TESTCASE_BN > .involved_frames
-n_involved=`wc -l .involved_frames | awk '{ print $1 }'`
-count=1
-for frame in `cat .involved_frames | cut -d\| -f4 | cut -d\. -f1`
+for frame in `cat .involved_frames`
 do
   xml=( `ls ${frame}.*xml` )
-  involved_xmls="$involved_xmls $xml"
   mtd=( `ls ${frame}.*metadata` )
   isrequest=$(grep "isrequest=1" $mtd)
   if [ -n "$isrequest" ]
@@ -251,15 +249,17 @@ do
     hbh_ini="$(grep -o "hop-by-hop-id=\"[0-9]*\"" $xml)"
     sed -i 's/'$hbh_ini'/hop-by-hop-id="'$frame'"/' $xml
   fi
-  count=$((count+1))
 done
+rm .involved_frames
 
-# Involved origin hosts:
-grep "<avp name=\"Origin-Host\"" $involved_xmls | cut -d\" -f4 | sort -u > .involved_origin_hosts
-grep -w -f .involved_origin_hosts $ohs_file > .involved_origin_hosts_with_info
+# Simplify origin hosts file (oh + adml role):
+sort -u .involved_origin_hosts > .involved_origin_hosts_unique
+grep -w -f .involved_origin_hosts_unique $ohs_file > .involved_origin_hosts_with_info
+mv .involved_origin_hosts_with_info $ohs_file
+rm .involved_origin_hosts .involved_origin_hosts_unique
 
 # Missing CERs:
-for oh in $(awk -v input=client '{if ($2 == input) print $1;}' .involved_origin_hosts_with_info)
+for oh in $(awk -v input=client '{if ($2 == input) print $1;}' $ohs_file)
 do
   cer=$SOURCE_DIR/cer.${oh}.xml
   if [ ! -f $cer ]
@@ -282,7 +282,7 @@ EOF
 done
 
 # Missing CEAs:
-for oh in $(awk -v input=server '{if ($2 == input) print $1;}' .involved_origin_hosts_with_info)
+for oh in $(awk -v input=server '{if ($2 == input) print $1;}' $ohs_file)
 do
   cea=$SOURCE_DIR/cea.${oh}.xml
   if [ ! -f $cea ]
@@ -315,7 +315,5 @@ EOF
   fi
 done
 
-rm -f .involved_origin_hosts .involved_origin_hosts_with_info
-
 exit 0