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

diff --git a/example/diameter/launcher/DEPLOY.sh b/example/diameter/launcher/DEPLOY.sh
index d574860..d3725d3 100755
--- a/example/diameter/launcher/DEPLOY.sh
+++ b/example/diameter/launcher/DEPLOY.sh
@@ -1,12 +1,18 @@
-#!/bin/ksh
+#!/bin/bash
 
-# Functions & variables
+#############
+# VARIABLES #
+#############
 SETUPS_DIR=../../../source/diameter/stack/setups
-MSGDTD_DIR=../../../source/diameter/codec/message.dtd
+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
@@ -14,96 +20,125 @@ _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=\"ndl_\`date '+%Y%m%d%H%M%S'\`\"" >> run.sh
-echo "echo \$EXE > .exe"  >> run.sh
-#echo "rm \$EXE 2>/dev/null" >> run.sh
-echo "echo ; echo \"Executable paths:\" ; echo" >> run.sh
-echo "for i in \`ls execs/.*/*\` ; do echo \$i ; done" >> run.sh
-echo "echo ; echo \"Input the executable path:\" ; read path ; while test \"\$path\" = \"\" ; do read path ; done" >> run.sh
-echo "ln -s \$path \$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
-chmod a+x run.sh
-rm args.txt
+  # 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
-do
-   stacks/dependence.sh $i >/dev/null
-   stack=`basename $i`
-   if test "$stack" != "$BASE_PROT"
-   then
+  for i in stacks/*commands*xml
+  do
+    stacks/dependence.sh $i >/dev/null
+    stack=`basename $i`
+    if test "$stack" != "$BASE_PROT"
+    then
       > .dictionary__${stack}
       for j in `cat ${i}.dep`
       do
-         echo "${j},\c" >> .dictionary__${stack}
+        echo -n "${j}," >> .dictionary__${stack}
       done
       echo "stacks/$BASE_PROT,stacks/${stack}" >> .dictionary__${stack}
-   fi
-done
+    fi
+  done
+
+  # Default:
+  ln -s .dictionary__commands_qosControl.xml .dictionary
 
-# 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"
 echo "---------------------------------------"
 echo
-echo "Input deployment path [$DPATH_dftl]:"
+echo "Input deployment path [$DPATH_dflt]:"
 read DPATH
-[[ "$DPATH" = "" ]] && DPATH=$DPATH_dflt
-mkdir -p $DPATH
-mkdir $DPATH/stacks
+[ "$DPATH" = "" ] && DPATH=$DPATH_dflt
+[ -d $DPATH ] && _exit "The path '$DPATH' already exists. Remove it before continue..."
 
 echo "Basic checkings ..."
-[[ ! -f $EXEC ]] && salir "Anna Diameter Launcher (ADL) is not installed in the system. Execute 'sudo scons install' for 'anna' suite."
-[[ ! -d $SETUPS_DIR ]] && salir "Diameter stacks not found ($SETUPS_DIR). Perhaps you executed '$0' 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 ..."
-cp $EXEC $DPATH/launcher
-cp resources/* $DPATH
+mkdir -p $DPATH
+mkdir -p $DPATH/stacks
+mkdir -p $DPATH/DTDs
+mkdir -p $DPATH/counters
+cp $EXEC $DPATH/ADL-launcher
+cp -rL $RESOURCES_DIR/* $DPATH
 cp $SETUPS_DIR/*xml $DPATH/stacks
 cp $SETUPS_DIR/*sh $DPATH/stacks
-cp $MSGDTD_DIR $DPATH
+cp $SETUPS_DIR/readme.txt $DPATH/stacks
+cp $MSGDTD $DPATH/DTDs
+cp $DCTDTD $DPATH/DTDs
 
 echo "Preparing ..."
 cd $DPATH
-createRunScript
+createRunScript $option
 createDictionaryPaths
 cd - >/dev/null
 
 # Help:
-echo "Stacks available at '.dictionary__<stack description>', create a symbolic link from '.dictionary'." >> tmp/README
-echo "Template for xml messages: message.dtd (informative, not actually required by process)" >> tmp/README
-echo "Start with 'run.sh'" >> tmp/README
-
-mv tmp ADL-installer
-tar cvfz ADL-installer.tar.gz ADL-installer
-rm -rf ADL-installer
-
 echo
-echo "Created ADL-installer.tar.gz !"
+echo "Go to '$DPATH' and see README file"
+echo
+echo "Done!"
+echo
 echo