X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FDEPLOY.sh;h=e44e92872ef1775b62cc362770bbf4ea21cde9ac;hb=fca0f585780127dba2564de6741d2de9a5e59fb4;hp=7963f07d36c06f1c24c79b6015103f0bc4121c38;hpb=74730c7d0e4f713c932d6b06a07644d1c3c6c6c1;p=anna.git

diff --git a/example/diameter/launcher/DEPLOY.sh b/example/diameter/launcher/DEPLOY.sh
index 7963f07..e44e928 100755
--- a/example/diameter/launcher/DEPLOY.sh
+++ b/example/diameter/launcher/DEPLOY.sh
@@ -29,12 +29,13 @@ _exit () {
 }
 
 usage () {
-  echo "Usage: $0 [deployment_type: a|b|f] [deployment_path]"
+  echo "Usage: $0 [deployment_type: a|b|f|s] [deployment_path]"
   echo
   echo "       deployment_type:"
   echo "          a=advanced"
   echo "          b=basic"
   echo "          f=function test client"
+  echo "          s=system test client"
   echo "       deployment_path:"
   echo "          non-existent path directory."
   echo
@@ -42,6 +43,7 @@ usage () {
   echo "          $0 b $HOME/ADML/basicServer"
   echo "          $0 b $HOME/ADML/MMSbalancer"
   echo "          $0 f $HOME/ADML/tester"
+  echo "          $0 s $HOME/ADML/stress-client"
   echo
   exit 0
 }
@@ -54,6 +56,7 @@ createRunScript () {
   local other=
   [ "$1" = "a" ] && { exe=ADML-launcher ; other="--httpServer \`grep -v ^# .httpServer\`"; }
   [ "$1" = "f" ] && { exe=ADML-ftclient ; ln -s ADML-launcher $exe ; }
+  [ "$1" = "s" ] && { exe=ADML-stclient ; other="--disableLogs"; ln -s ADML-launcher $exe ; }
 
   echo "Creating 'run.sh' script ..."
 
@@ -65,9 +68,9 @@ STARTED=\`pgrep \$EXE 2>/dev/null\`
 [ \$? -eq 0 ] && { echo "Already started!"; echo "\$STARTED" ; exit 1 ; }
 ./pre-start.sh
 0> launcher.trace
-rm -f counters/*
+rm -f counters/* test-reports/*
 # Execution line:
-./\$EXE --services services.xml --cntDir counters $other &
+./\$EXE --services services.xml --cntDir counters --tmDir test-reports $other &
 echo \$! > .pid
 EOF
 
@@ -138,6 +141,7 @@ for STACKMGMT_EXEC in ${STACKMGMT_EXECS[@]}; do
   echo "not found"
 done
 [ -z "$available" ] && _exit "Anna Diameter Stack Management Tool is not installed neither linked. See README.md (Install section)."
+STACKMGMT_EXEC=`readlink -f $STACKMGMT_EXEC`
 
 [ ! -d $SETUPS_DIR ] && _exit "Diameter stacks not found ($SETUPS_DIR)."
 
@@ -150,6 +154,7 @@ then
   echo " (a)dvanced version:     includes burst management script and templates for different scenarios. Automatic configuration during start."
   echo " (b)asic version:        4 types of launcher (client, server, balancer, dummy), lightly configured and managed through SIGURS2 method."
   echo " (f)unction test client: special client with regexp scheduler script based on splitted traffic logs. Requires a server to perform the tests."
+  echo " (s)ystem test client:   special client for stress testing. Requires a server to perform the tests."
   echo
   echo "Input option [b]:"
   read option
@@ -177,6 +182,12 @@ case $option in
     DPATH_dflt=$HOME/ADML/ft-client
   ;;
 
+  s)
+    echo "ST deployment"
+    DEPLOYMENTS_DIR=deployments/st-client
+    DPATH_dflt=$HOME/ADML/st-client
+  ;;
+
   *)
     _exit "Invalid deployment type '$option' !!"
   ;;
@@ -199,7 +210,8 @@ mkdir -p $DPATH
 mkdir -p $DPATH/stacks
 mkdir -p $DPATH/DTDs
 mkdir -p $DPATH/counters
-[ "option" = "b" ] && mkdir -p $DPATH/services
+mkdir -p $DPATH/test-reports
+[ "$option" = "b" ] && mkdir -p $DPATH/services
 if [ "$EXEC" = "$EXEC_installed" ]
 then
   ln -s $EXEC_installed $DPATH/ADML-launcher
@@ -213,7 +225,7 @@ cp $SETUPS_DIR/readme.txt $DPATH/stacks
 cp $MSGDTD $DPATH/DTDs
 cp $DCTDTD $DPATH/DTDs
 cp $SRVDTD $DPATH/DTDs
-[ "option" = "b" ] && cp $SERVICES/* $DPATH/services
+[ "$option" = "b" ] && cp $SERVICES/* $DPATH/services
 
 echo "Preparing ..."
 cd $DPATH