X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FDEPLOY.sh;h=fe353711b8f22e8f1573cbd5e7303d24bd236894;hb=97a93101fb874a3237083d72c6d6f8c8df8dcfba;hp=1023729fdca92bccb3fdbb654a09e3fed7d57ffb;hpb=18319deabbc8563fc112795968372e96263e6fe4;p=anna.git

diff --git a/example/diameter/launcher/DEPLOY.sh b/example/diameter/launcher/DEPLOY.sh
index 1023729..fe35371 100755
--- a/example/diameter/launcher/DEPLOY.sh
+++ b/example/diameter/launcher/DEPLOY.sh
@@ -6,7 +6,6 @@
 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
 SERVICES=./resources/services_examples
 STACK_EXAMPLES=./resources/stack_examples
 SRVDTD=$SERVICES/services.dtd
@@ -18,7 +17,6 @@ EXECS=( $EXEC_installed ./release/example_diameter_launcher ./debug/example_diam
 # Stack management
 STACKMGMT_EXEC_installed=/opt/bin/anna/example_diameter_stackManagement
 STACKMGMT_EXECS=( $STACKMGMT_EXEC_installed ../stackManagement/release/example_diameter_stackManagement ../stackManagement/debug/example_diameter_stackManagement )
-:1
 
 #############
 # FUNCTIONS #
@@ -42,10 +40,10 @@ usage () {
   echo "          non-existent path directory."
   echo
   echo "       For example:"
-  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 "          $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
 }
@@ -79,42 +77,6 @@ EOF
   chmod a+x run.sh
 }
 
-createDictionaryPaths () {
-  echo "Creating dictionaries ..."
-
-  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 -n "${j} " >> .dictionary-${stack}
-      done
-      echo "stacks/$BASE_PROT stacks/${stack}" >> .dictionary-${stack}
-    fi
-  done
-
-  # Create autonomous dictionaries:
-  mkdir stacks/autonomous
-  for i in `ls .dictionary-*`
-  do
-    name=$(echo $i | cut -d\- -f2)
-    $STACKMGMT_EXEC `cat $i` >/dev/null
-    mv result.xml stacks/autonomous/$name
-  done
-
-  # Cleanup:
-  rm -f stacks/*.dep
-  rm -f .dictionary-*
-  rm -f example_diameter_stackManagement.trace*
-
-  # Default:
-  ln -s stacks/autonomous/commands_qosControl.xml dictionary.xml
-}
-
 #############
 # EXECUTION #
 #############
@@ -169,25 +131,25 @@ case $option in
   a)
     echo "Advanced deployment"
     DEPLOYMENTS_DIR=deployments/advanced
-    DPATH_dflt=$HOME/ADML/advanced
+    DPATH_dflt=$HOME/ADML-advanced
   ;;
 
   b)
     echo "Basic deployment"
     DEPLOYMENTS_DIR=deployments/basic
-    DPATH_dflt=$HOME/ADML/basic
+    DPATH_dflt=$HOME/ADML-basic
   ;;
 
   f)
     echo "FT deployment"
     DEPLOYMENTS_DIR=deployments/ft-client
-    DPATH_dflt=$HOME/ADML/ft-client
+    DPATH_dflt=$HOME/ADML-ft-client
   ;;
 
   s)
     echo "ST deployment"
     DEPLOYMENTS_DIR=deployments/st-client
-    DPATH_dflt=$HOME/ADML/st-client
+    DPATH_dflt=$HOME/ADML-st-client
   ;;
 
   *)
@@ -206,7 +168,7 @@ else
 fi
 
 [ -d $DPATH ] && _exit "The installation path '$DPATH' must not exists."
-EXE=ADML-`basename $DPATH`
+EXE=`basename $DPATH`
 
 echo "Copying to '$DPATH' ..."
 mkdir -p $DPATH
@@ -215,12 +177,23 @@ mkdir -p $DPATH/DTDs
 mkdir -p $DPATH/counters
 mkdir -p $DPATH/test-reports
 [ "$option" = "b" ] && mkdir -p $DPATH/services
+
+# ADML executable:
 if [ "$EXEC" = "$EXEC_installed" ]
 then
   ln -s $EXEC_installed $DPATH/ADML-launcher
 else
   cp $EXEC $DPATH/ADML-launcher
 fi
+
+# Stack management tool:
+if [ "$STACKMGMT_EXEC" = "$STACKMGMT_EXEC_installed" ]
+then
+  ln -s $STACKMGMT_EXEC_installed $DPATH/stacks/stack-mgmt
+fi
+# Copy binary just in case: 
+[ ! -f $DPATH/stacks/stack-mgmt ] && cp $STACKMGMT_EXEC $DPATH/stacks/stack-mgmt
+
 cp -rL $DEPLOYMENTS_DIR/* $DPATH
 cp $SETUPS_DIR/*xml $DPATH/stacks
 cp $SETUPS_DIR/*sh $DPATH/stacks
@@ -235,7 +208,8 @@ cp $SRVDTD $DPATH/DTDs
 echo "Preparing ..."
 cd $DPATH
 createRunScript $option
-createDictionaryPaths
+stacks/makeAutonomous.sh commands_qosControl.xml stacks/stack-mgmt >/dev/null
+ln -s stacks/autonomous.commands_qosControl.xml dictionary.xml
 cd - >/dev/null
 
 # Help: