From 5dc29aeb2500c1f0f344e8ab011925754a7c73a5 Mon Sep 17 00:00:00 2001
From: Dileep Ranganathan <dileep.ranganathan@intel.com>
Date: Sat, 6 Oct 2018 16:35:11 -0700
Subject: OOF HAS CSIT with MUSIC v3 integration

Updated HAS setup and teardown scripts
Added MUSIC v3 support, AAF support, Basic Authorization for MUSIC.
Used AAF_RootCA for A&AI simulator.
Sync conductor.conf based on generated latest conf.

Change-Id: Id1a6c8a4e524a6ade5b60277a6cb538724902d11
Issue-ID: OPTFRA-366
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
---
 scripts/optf-has/has/simulator_script.sh | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'scripts/optf-has/has/simulator_script.sh')

diff --git a/scripts/optf-has/has/simulator_script.sh b/scripts/optf-has/has/simulator_script.sh
index 42dcd57f..ccb479b2 100755
--- a/scripts/optf-has/has/simulator_script.sh
+++ b/scripts/optf-has/has/simulator_script.sh
@@ -53,7 +53,7 @@ cat ./Dockerfile
 docker build -t aaisim .  
 
 # run aaisim
-docker run -d --name aaisim -p 8081:8081  aaisim
+docker run -d --name aaisim -p 8081:8081 aaisim
 
 AAISIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aaisim`
 echo "AAISIM_IP=${AAISIM_IP}"
@@ -77,9 +77,32 @@ echo "MULTICLOUDSIM_IP=${MULTICLOUDSIM_IP}"
 
 ${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${MULTICLOUDSIM_IP} 8082
 
+# prepare aafsim
+echo "simulator_script: prepare aafsim "
+cd ${WORK_DIR}/has/conductor/conductor/tests/functional/simulators/aafsim/
+
+# check Dockerfile content
+echo "simulator_script: Dockerfile "
+cat ./Dockerfile
+
+# build aafsim
+echo "simulator_script: build docker "
+docker build -t aafsim .
+
+# run aafsim
+echo "simulator_script: run docker "
+docker run -d --name aafsim -p 8100:8100 aafsim
+
+AAFSIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aafsim`
+echo "simulator_script: AAFSIM_IP=${AAFSIM_IP}"
+
+#echo "simulator_script: wait_for_port"
+${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${AAFSIM_IP} 8100
+
 # wait a while before continuing
 sleep 2
 
 echo "inspect docker things for tracing purpose"
 docker inspect aaisim
 docker inspect multicloudsim
+docker inspect aafsim
-- 
cgit 1.2.3-korg