X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FDEPLOY.sh;h=d3725d351e339688f384b8fa9fd8fd9e0e4e74e8;hb=2ddc4abd3627f5f5b4df32de199f364aa3844491;hp=e3875265f13620d0917c253d028654a109762122;hpb=a539fef8b5a3b87ab7306138eba0ebc0db764e29;p=anna.git

diff --git a/example/diameter/launcher/DEPLOY.sh b/example/diameter/launcher/DEPLOY.sh
index e387526..d3725d3 100755
--- a/example/diameter/launcher/DEPLOY.sh
+++ b/example/diameter/launcher/DEPLOY.sh
@@ -1,13 +1,18 @@
-#!/bin/ksh
+#!/bin/bash
 
-# Functions & variables
+#############
+# VARIABLES #
+#############
 SETUPS_DIR=../../../source/diameter/stack/setups
 MSGDTD=../../../include/anna/diameter/codec/message.dtd
 DCTDTD=../../../include/anna/diameter/stack/dictionary.dtd
 BASE_PROT=commands_baseProtocol.xml
-EXEC=/opt/bin/anna/example_diameter_launcher
+EXEC=./debug/example_diameter_launcher
 DPATH_dflt=$HOME/ADL
 
+#############
+# FUNCTIONS #
+#############
 _exit () {
    echo
    echo $1
@@ -15,31 +20,33 @@ _exit () {
    exit
 }
 
+# $1: deployment type
 createRunScript () {
 
-  echo "#!/bin/ksh" > run.sh
-  echo "EXE=\`cat .exe 2>/dev/null\`" >> run.sh
-  echo "STARTED=\`ps -fea | grep \"\$EXE\" | grep -v grep\`" >> run.sh
-  echo "[ \"\$EXE\" != \"\" -a \"\$STARTED\" != \"\" ] && { echo \"Already started!\"; echo \"\$STARTED\" ; exit ; }" >> run.sh
-  echo "./pre-start.sh" >> run.sh
-  echo "> launcher.traces" >> run.sh
-  echo "EXE=\"./ADL-launcher\"" >> run.sh
-  echo "echo \$EXE > .exe"  >> run.sh
-  echo >> run.sh
-  echo -n "\$EXE " >> run.sh
-  for i in `cat args.txt | grep -v "^#"`
-  do
-    echo -n "$i " >> run.sh
-  done
-  echo "&" >> run.sh
+  # Basic launcher 'run.sh' will be created at deployment configuration: 
+  [ "$1" = "b" ] && return
+  [ "$1" = "a" ] && exe=ADL-launcher
+  [ "$1" = "f" ] && { exe=ADL-ftclient ; ln -s ADL-launcher $exe ; }
+
+  cat << EOF > run.sh
+#!/bin/bash
+cd \`dirname \$0\`
+EXE=$exe
+STARTED=\`pgrep \$EXE 2>/dev/null\`
+[ \$? -eq 0 ] && { echo "Already started!"; echo "\$STARTED" ; exit 1 ; }
+./pre-start.sh
+0> launcher.traces
+# Execution line:
+./\$EXE -cntDir counters $(for i in `cat args.txt | grep -v "^#"`; do echo -n "$i "; done)&
+echo \$! > .pid
+EOF
+
   chmod a+x run.sh
   rm args.txt
 }
 
 createDictionaryPaths () {
-
-
-for i in stacks/*commands*xml
+  for i in stacks/*commands*xml
   do
     stacks/dependence.sh $i >/dev/null
     stack=`basename $i`
@@ -56,11 +63,15 @@ for i in stacks/*commands*xml
 
   # Default:
   ln -s .dictionary__commands_qosControl.xml .dictionary
+
+  # Remove deps:
+  rm -f stacks/*.dep
 }
 
 #############
 # EXECUTION #
 #############
+cd `dirname $0`
 echo
 echo "---------------------------------------"
 echo "Anna Diameter Launcher (ADL) deployment"
@@ -68,27 +79,57 @@ echo "---------------------------------------"
 echo
 echo "Input deployment path [$DPATH_dflt]:"
 read DPATH
-[[ "$DPATH" = "" ]] && DPATH=$DPATH_dflt
-[[ -d $DPATH ]] && _exit "The path '$DPATH' already exists. Remove it before continue..."
+[ "$DPATH" = "" ] && DPATH=$DPATH_dflt
+[ -d $DPATH ] && _exit "The path '$DPATH' already exists. Remove it before continue..."
 
 echo "Basic checkings ..."
-[[ ! -f $EXEC ]] && _exit "Anna Diameter Launcher (ADL) is not installed in the system. Execute 'sudo scons install' for 'anna' suite."
-[[ ! -d $SETUPS_DIR ]] && _exit "Diameter stacks not found ($SETUPS_DIR). Perhaps you executed this script out of its parent path."
+[ ! -f $EXEC ] && _exit "Anna Diameter Launcher (ADL) is not linked. Execute 'scons' for 'anna' suite."
+[ ! -d $SETUPS_DIR ] && _exit "Diameter stacks not found ($SETUPS_DIR). Perhaps you executed this script out of its parent path."
+
+echo
+echo "Deploy one of these versions:"
+echo
+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."
+echo
+echo "Input option [b]:"
+read option
+[ "$option" = "" ] && option=b
+case $option in
+  a)
+    RESOURCES_DIR=resources/advanced
+  ;;
+
+  b)
+    RESOURCES_DIR=resources/basic
+  ;;
+
+  f)
+    RESOURCES_DIR=resources/ft-client
+  ;;
+
+  *)
+    _exit "Unknown option !!"
+  ;;
+esac
 
 echo "Copying ..."
 mkdir -p $DPATH
 mkdir -p $DPATH/stacks
+mkdir -p $DPATH/DTDs
+mkdir -p $DPATH/counters
 cp $EXEC $DPATH/ADL-launcher
-cp resources/* $DPATH
+cp -rL $RESOURCES_DIR/* $DPATH
 cp $SETUPS_DIR/*xml $DPATH/stacks
 cp $SETUPS_DIR/*sh $DPATH/stacks
 cp $SETUPS_DIR/readme.txt $DPATH/stacks
-cp $MSGDTD $DPATH
-cp $DCTDTD $DPATH
+cp $MSGDTD $DPATH/DTDs
+cp $DCTDTD $DPATH/DTDs
 
 echo "Preparing ..."
 cd $DPATH
-createRunScript
+createRunScript $option
 createDictionaryPaths
 cd - >/dev/null