Add multicloud sim

Issue-ID: OPTFRA-212

Change-Id: Ice56b185857fc88b298c14dcce359289635b1db3
Signed-off-by: Leonardo Bellini <leonardo.bellini@att.com>

diff --git a/test/csit/scripts/optf-has/has/has_script.sh b/test/csit/scripts/optf-has/has/has_script.sh
index ed0f488..ac907ee 100755 (executable)
--- a/test/csit/scripts/optf-has/has/has_script.sh
+++ b/test/csit/scripts/optf-has/has/has_script.sh
@@ -56,6 +56,12 @@ echo "AAISIM_IP=${AAISIM_IP}"
 # change AAI reference to the local instance
 sed  -i -e "s%localhost:8081/%${AAISIM_IP}:8081/%g" /tmp/conductor/properties/conductor.conf
 
+MULTICLOUDSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' multicloudsim`
+echo "MULTICLOUDSIM_IP=${MULTICLOUDSIM_IP}"
+
+# change MULTICLOUD reference to the local instance
+sed  -i -e "s%localhost:8082/%${MULTICLOUDSIM_IP}:8082/%g" /tmp/conductor/properties/conductor.conf
+
 #onboard conductor into music
 curl -vvvvv --noproxy "*" --request POST http://${MUSIC_IP}:8080/MUSIC/rest/v2/admin/onboardAppWithMusic -H "Content-Type: application/json" --data @${WORKSPACE}/test/csit/tests/optf-has/has/data/onboard.json
 

diff --git a/test/csit/scripts/optf-has/has/simulator_script.sh b/test/csit/scripts/optf-has/has/simulator_script.sh
index e5bc43d..2e8a0e6 100755 (executable)
--- a/test/csit/scripts/optf-has/has/simulator_script.sh
+++ b/test/csit/scripts/optf-has/has/simulator_script.sh
@@ -30,11 +30,10 @@ cd ${DIR}
 # omit the -p parameter to create a temporal directory in the default location
 WORK_DIR=`mktemp -d -p "$DIR"`
 echo ${WORK_DIR}
-
 cd ${WORK_DIR}
 
+# clone optf-has project
 git clone https://gerrit.onap.org/r/optf/has
-cd has/conductor/conductor/tests/functional/simulators/aaisim/
 
 #echo "i am ${USER} : only non jenkins users may need proxy settings"
 if [ ${USER} != 'jenkins' ]; then
@@ -44,6 +43,9 @@ if [ ${USER} != 'jenkins' ]; then
 
 fi
 
+# prepare aaisim
+cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/aaisim/
+
 # check Dockerfile content
 cat ./Dockerfile
 
@@ -58,8 +60,26 @@ echo "AAISIM_IP=${AAISIM_IP}"
 
 ${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${AAISIM_IP} 8081
 
+# prepare multicloudsim
+cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/multicloudsim/
+
+# check Dockerfile content
+cat ./Dockerfile
+
+# build multicloudsim
+docker build -t multicloudsim .
+
+# run multicloudsim
+docker run -d --name multicloudsim -p 8082:8082  multicloudsim
+
+MULTICLOUDSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' multicloudsim`
+echo "MULTICLOUDSIM_IP=${MULTICLOUDSIM_IP}"
+
+${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${MULTICLOUDSIM_IP} 8082
+
 # wait a while before continuing
 sleep 2
 
 echo "inspect docker things for tracing purpose"
 docker inspect aaisim
+docker inspect multicloudsim

diff --git a/test/csit/scripts/optf-has/has/simulator_teardown_script.sh b/test/csit/scripts/optf-has/has/simulator_teardown_script.sh
index e300a98..a2edd33 100755 (executable)
--- a/test/csit/scripts/optf-has/has/simulator_teardown_script.sh
+++ b/test/csit/scripts/optf-has/has/simulator_teardown_script.sh
@@ -16,6 +16,7 @@
 #
 echo "optf/has scripts docker containers killing";
 docker stop aaisim
+docker stop multicloudsim
 
 docker rm aaisim
-
+docker rm multicloudsim