From d7b32ee56cf86c7702943d6afbac34c668b023ed Mon Sep 17 00:00:00 2001
From: "Eduardo Ramos Testillano (eramedu)"
 <eduardo.ramos.testillano@ericsson.com>
Date: Mon, 27 Apr 2020 03:54:56 +0200
Subject: [PATCH] ADML is not really an AOTS deployment but an simple ADML one

It has http support
---
 INSTALL_AOTS.md                                          | 4 ----
 .../{deploy-aots-adml.sh => deploy-adml-http.sh}         | 9 ++++++---
 .../launcher/deployments/{aots-adml => adml}/ACTIONS.md  | 0
 .../launcher/deployments/{aots-adml => adml}/HINTS.md    | 0
 .../launcher/deployments/{aots-adml => adml}/args.ft     | 0
 .../launcher/deployments/{aots-adml => adml}/args.st     | 0
 .../deployments/{aots-adml => adml}/services.xml.example | 0
 .../launcher/deployments/{aots-adml => adml}/stacks      | 0
 .../launcher/deployments/{aots-adml => adml}/start.sh    | 0
 .../launcher/deployments/{aots-adml => adml}/stop.sh     | 0
 .../diameter/launcher/deployments/aots-setup/agents/ADML | 2 +-
 11 files changed, 7 insertions(+), 8 deletions(-)
 rename example/diameter/launcher/{deploy-aots-adml.sh => deploy-adml-http.sh} (93%)
 rename example/diameter/launcher/deployments/{aots-adml => adml}/ACTIONS.md (100%)
 rename example/diameter/launcher/deployments/{aots-adml => adml}/HINTS.md (100%)
 rename example/diameter/launcher/deployments/{aots-adml => adml}/args.ft (100%)
 rename example/diameter/launcher/deployments/{aots-adml => adml}/args.st (100%)
 rename example/diameter/launcher/deployments/{aots-adml => adml}/services.xml.example (100%)
 rename example/diameter/launcher/deployments/{aots-adml => adml}/stacks (100%)
 rename example/diameter/launcher/deployments/{aots-adml => adml}/start.sh (100%)
 rename example/diameter/launcher/deployments/{aots-adml => adml}/stop.sh (100%)

diff --git a/INSTALL_AOTS.md b/INSTALL_AOTS.md
index 021707b..5da6589 100644
--- a/INSTALL_AOTS.md
+++ b/INSTALL_AOTS.md
@@ -6,10 +6,6 @@
 
 Execute 'example/diameter/launcher/deploy-aots.sh' and follow instructions.
 
-### AOTS ADML Agent
-
-Execute 'example/diameter/launcher/deploy-aots-adml.sh' and follow instructions.
-
 ## Documentation
 
 See README.md file at installation target directory.
diff --git a/example/diameter/launcher/deploy-aots-adml.sh b/example/diameter/launcher/deploy-adml-http.sh
similarity index 93%
rename from example/diameter/launcher/deploy-aots-adml.sh
rename to example/diameter/launcher/deploy-adml-http.sh
index 4dc5aa6..3ee0e58 100755
--- a/example/diameter/launcher/deploy-aots-adml.sh
+++ b/example/diameter/launcher/deploy-adml-http.sh
@@ -26,7 +26,7 @@ _exit () {
 
 echo
 echo "------------------------------------------------------"
-echo "               AOTS ADML Agent installation           "
+echo "         ADML with HTTP support installation          "
 echo "------------------------------------------------------"
 echo
 [ -d $PROJECT_ROOT/build/Release ] && VARIANT=Release
@@ -35,7 +35,7 @@ echo
 build_type_letter=$(echo $VARIANT | cut -c1 | tr '[:upper:]' '[:lower:]')
 
 version__dflt=v"`date +'%y'`.`date +'%m'`.`date +'%d'`$build_type_letter"
-INSTALL__dflt=$HOME/3rdParty/anna-aots-adml-builds/v"`date +'%y'`.`date +'%m'`.`date +'%d'`$build_type_letter"
+INSTALL__dflt=$HOME/3rdParty/anna-adml-http-builds/v"`date +'%y'`.`date +'%m'`.`date +'%d'`$build_type_letter"
 
 echo "Choose the target path for installation [$INSTALL__dflt]:"
 echo " (enter a non-existent directory)"
@@ -48,7 +48,7 @@ echo
 echo "Stage 1: Deploying resources ......................"
 echo
 mkdir -p $INSTALL
-cp -rL $SCR_DIR/deployments/aots-adml/* $INSTALL
+cp -rL $SCR_DIR/deployments/adml/* $INSTALL
 
 # VARIABLES ######################################
 # Sources:
@@ -112,5 +112,8 @@ echo "${httpOpt}" >> ${ADML}/args.ft
 echo "${httpOpt}" >> ${ADML}/args.st
 echo "localhost:8000" > ${ADML}/.httpServer
 
+# Remove AOTS actions:
+rm ${ADML}/ACTIONS.md
+
 _exit "Done!" 0
 
diff --git a/example/diameter/launcher/deployments/aots-adml/ACTIONS.md b/example/diameter/launcher/deployments/adml/ACTIONS.md
similarity index 100%
rename from example/diameter/launcher/deployments/aots-adml/ACTIONS.md
rename to example/diameter/launcher/deployments/adml/ACTIONS.md
diff --git a/example/diameter/launcher/deployments/aots-adml/HINTS.md b/example/diameter/launcher/deployments/adml/HINTS.md
similarity index 100%
rename from example/diameter/launcher/deployments/aots-adml/HINTS.md
rename to example/diameter/launcher/deployments/adml/HINTS.md
diff --git a/example/diameter/launcher/deployments/aots-adml/args.ft b/example/diameter/launcher/deployments/adml/args.ft
similarity index 100%
rename from example/diameter/launcher/deployments/aots-adml/args.ft
rename to example/diameter/launcher/deployments/adml/args.ft
diff --git a/example/diameter/launcher/deployments/aots-adml/args.st b/example/diameter/launcher/deployments/adml/args.st
similarity index 100%
rename from example/diameter/launcher/deployments/aots-adml/args.st
rename to example/diameter/launcher/deployments/adml/args.st
diff --git a/example/diameter/launcher/deployments/aots-adml/services.xml.example b/example/diameter/launcher/deployments/adml/services.xml.example
similarity index 100%
rename from example/diameter/launcher/deployments/aots-adml/services.xml.example
rename to example/diameter/launcher/deployments/adml/services.xml.example
diff --git a/example/diameter/launcher/deployments/aots-adml/stacks b/example/diameter/launcher/deployments/adml/stacks
similarity index 100%
rename from example/diameter/launcher/deployments/aots-adml/stacks
rename to example/diameter/launcher/deployments/adml/stacks
diff --git a/example/diameter/launcher/deployments/aots-adml/start.sh b/example/diameter/launcher/deployments/adml/start.sh
similarity index 100%
rename from example/diameter/launcher/deployments/aots-adml/start.sh
rename to example/diameter/launcher/deployments/adml/start.sh
diff --git a/example/diameter/launcher/deployments/aots-adml/stop.sh b/example/diameter/launcher/deployments/adml/stop.sh
similarity index 100%
rename from example/diameter/launcher/deployments/aots-adml/stop.sh
rename to example/diameter/launcher/deployments/adml/stop.sh
diff --git a/example/diameter/launcher/deployments/aots-setup/agents/ADML b/example/diameter/launcher/deployments/aots-setup/agents/ADML
index 703e402..a91053a 120000
--- a/example/diameter/launcher/deployments/aots-setup/agents/ADML
+++ b/example/diameter/launcher/deployments/aots-setup/agents/ADML
@@ -1 +1 @@
-../../aots-adml
\ No newline at end of file
+../../adml
\ No newline at end of file
-- 
2.20.1