From a9e6351a1afeb124bff2479ab0dab2d3f0585591 Mon Sep 17 00:00:00 2001
From: Eduardo Ramos Testillano <eduardo.ramos.testillano@ericsson.com>
Date: Sat, 29 Oct 2016 00:17:40 +0200
Subject: [PATCH] improvs.

---
 dynamic/launcher/gx/00001/dynamic.suffix      |  7 +++++--
 .../launcher/deployments/st-client/program.sh | 21 ++++++++++++-------
 .../launcher/deployments/st-client/run_all.sh |  2 ++
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/dynamic/launcher/gx/00001/dynamic.suffix b/dynamic/launcher/gx/00001/dynamic.suffix
index c39ba94..97afc7f 100644
--- a/dynamic/launcher/gx/00001/dynamic.suffix
+++ b/dynamic/launcher/gx/00001/dynamic.suffix
@@ -12,9 +12,12 @@
 #  not processed here (not neccessary because reception conditions are enough to block
 #  the flow when something is wrong). Anyway, you could check ADML counters executing
 #  the command: ./operation show-oam
+# The main problem with a zeroed first timeout step, is that cycle repeats are not
+#  possible except if you reset the pool (hard reset) when close to finish, something
+#  very dificult to monitor.
 
 # Only CCR-Initial:
-0|7|CCR-I.xml
+5000|7|CCR-I.xml
 
 # CCR-Initial + CCR-Termination:
-0|7|CCR-I.xml|CCR-T.xml
+5000|7|CCR-I.xml|CCR-T.xml
diff --git a/example/diameter/launcher/deployments/st-client/program.sh b/example/diameter/launcher/deployments/st-client/program.sh
index 54b99ae..b000f8d 100755
--- a/example/diameter/launcher/deployments/st-client/program.sh
+++ b/example/diameter/launcher/deployments/st-client/program.sh
@@ -14,9 +14,7 @@ PROGRAM_LAYOUT_FILE=.st_conf_n_testcases_program_layout
 # FUNCTIONS #
 #############
 _exit() {
-  echo
-  echo $1
-  echo
+  echo -e "\n$1\n"
   exit 1
 }
 
@@ -183,7 +181,7 @@ else
   TESTCASE_DIR=$(readlink -f dynlibs/libanna_dynamicLauncherProcedure.so | xargs dirname)
   DYNAMIC_SUFFIX_FILE=$TESTCASE_DIR/dynamic.suffix
 
-  [ ! -f $DYNAMIC_SUFFIX_FILE ] && _exit "Missing '$DYNAMIC_SUFFIX_FILE' file. Use 'dynlibs/select.sh' to change the dynamic procedure and restart the ADML instances."
+  [ ! -f $DYNAMIC_SUFFIX_FILE ] && _exit "Missing '$DYNAMIC_SUFFIX_FILE' file.\nUse 'dynlibs/select.sh' to change the dynamic procedure and restart the ADML instances."
   dynamic_suffix=( $(grep -v ^# $DYNAMIC_SUFFIX_FILE) )
 
   # Multiple scenarios:
@@ -206,11 +204,20 @@ else
     done > $tmpfile
     cat $tmpfile
     echo
-    echo "Select the desired option:"
+    echo "Select the desired option (0 to input a user defined one):"
     read option
     while [ -z "$option" ]; do read option ; done
-    dynamic_suffix=$(grep "^${option}) " $tmpfile | cut -d" " -f2-)
-    [ -z "$dynamic_suffix" ] && _exit "Invalid option !"
+    if [ "$option" != "0" ]
+    then
+      dynamic_suffix=$(grep "^${option}) " $tmpfile | cut -d" " -f2-)
+      [ -z "$dynamic_suffix" ] && _exit "Invalid option !"
+    else
+      echo "Input specific program arguments:"
+      echo " (be sure that are supported by the dynamic procedure)"
+      echo
+      read dynamic_suffix
+      while [ -z "$dynamic_suffix" ]; do read dynamic_suffix ; done
+    fi
   fi
 
   # Modify xml files path:
diff --git a/example/diameter/launcher/deployments/st-client/run_all.sh b/example/diameter/launcher/deployments/st-client/run_all.sh
index 7849166..73d8a16 100755
--- a/example/diameter/launcher/deployments/st-client/run_all.sh
+++ b/example/diameter/launcher/deployments/st-client/run_all.sh
@@ -21,6 +21,8 @@ done
 echo
 wait $(jobs -p)
 
+sleep 3
+
 cat << EOF
      $(pgrep ADML- | wc -l) instances alive !
      $(netstat -a | grep :diameter | grep ESTABLISHED | wc -l) connections established !
-- 
2.20.1