5 files changed, 101 insertions, 36 deletions
diff --git a/test/csit/plans/optf-has/has/setup.sh b/test/csit/plans/optf-has/has/setup.sh
index f2ae3c78b..a0bef71d6 100755
--- a/test/csit/plans/optf-has/has/setup.sh
+++ b/test/csit/plans/optf-has/has/setup.sh
@@ -24,6 +24,9 @@ source ${WORKSPACE}/test/csit/scripts/optf-has/has/music_script.sh
 
 
 #
+echo "# simulator scripts calling";
+source ${WORKSPACE}/test/csit/scripts/optf-has/has/simulator_script.sh
+
 # add here eventual scripts needed for optf/has
 #
 echo "# optf/has scripts calling";
diff --git a/test/csit/plans/optf-has/has/teardown.sh b/test/csit/plans/optf-has/has/teardown.sh
index f4a91f9d5..41d7aff2c 100755
--- a/test/csit/plans/optf-has/has/teardown.sh
+++ b/test/csit/plans/optf-has/has/teardown.sh
@@ -21,15 +21,14 @@
 #
 
 #
-echo "# optf/has scripts docker containers killing";
+# optf/has scripts docker containers killing";
 #
-echo "# optf/has scripts calling";
+echo "# optf/has has scripts calling";
 source ${WORKSPACE}/test/csit/scripts/optf-has/has/has_teardown_script.sh
 
+echo "# optf/has simulator scripts calling";
+source ${WORKSPACE}/test/csit/scripts/optf-has/has/simulator_teardown_script.sh
 
-#
-echo "# optf/has scripts docker containers killing";
-#
-echo "# optf/has scripts calling";
+echo "# optf/has music scripts calling";
 source ${WORKSPACE}/test/csit/scripts/optf-has/has/music_teardown_script.sh
 
diff --git a/test/csit/scripts/optf-has/has/has_script.sh b/test/csit/scripts/optf-has/has/has_script.sh
index f6c2e7d51..242f5f63e 100755
--- a/test/csit/scripts/optf-has/has/has_script.sh
+++ b/test/csit/scripts/optf-has/has/has_script.sh
@@ -26,35 +26,6 @@ DIR=/tmp
 echo ${DIR}
 cd ${DIR}
 
-# the temp directory used, within $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}
-
-# check if tmp dir was created
-if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then
-  echo "Could not create temp dir"
-  exit 1
-fi
-
-#git clone https://gerrit.onap.org/r/optf/has
-cd has
-
-echo "i am ${USER} : only non jenkins users may need proxy settings"
-if [ ${USER} != 'jenkins' ]; then
-
-    # add proxy settings into this script when you work behind a proxy
-    ${WORKSPACE}/test/csit/scripts/optf-has/has/has_proxy_settings.sh ${WORK_DIR}
-
-fi
-
-# check Dockerfile content
-# cat conductor/docker/Dockerfile
-
-#./build-dockers.sh
-
 # create directory for volume and copy configuration file
 # run docker containers
 COND_CONF=/tmp/conductor/properties/conductor.conf
@@ -79,6 +50,12 @@ echo "MUSIC_IP=${MUSIC_IP}"
 # change MUSIC reference to the local instance
 sed  -i -e "s%localhost:8080/MUSIC%${MUSIC_IP}:8080/MUSIC%g" /tmp/conductor/properties/conductor.conf
 
+AAISIM_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' aaisim`
+echo "AAISIM_IP=${AAISIM_IP}"
+
+# change MUSIC reference to the local instance
+sed  -i -e "s%localhost:8081/%${AAISIM_IP}:8081/%g" /tmp/conductor/properties/conductor.conf
+
 docker run -d --name cond-cont -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf
 docker run -d --name cond-api -p "8091:8091" -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-api --port=8091 -- --config-file=/usr/local/bin/conductor.conf
 docker run -d --name cond-solv -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-solver --config-file=/usr/local/bin/conductor.conf
@@ -89,7 +66,7 @@ COND_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}
 ${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${COND_IP} 8091
 
 # wait a while before continuing
-sleep 30
+sleep 5
 
 echo "inspect docker things for tracing purpose"
 docker inspect cond-data
diff --git a/test/csit/scripts/optf-has/has/simulator_script.sh b/test/csit/scripts/optf-has/has/simulator_script.sh
new file mode 100755
index 000000000..524728270
--- /dev/null
+++ b/test/csit/scripts/optf-has/has/simulator_script.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+#
+# Copyright 2016-2017 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+echo "### This is ${WORKSPACE}/test/csit/scripts/optf-has/has/simulator_script.sh"
+#
+# add here whatever commands is needed to prepare the optf/has CSIT testing
+#
+
+# assume the base is /tmp dir
+DIR=/tmp
+
+# the directory of the script
+echo ${DIR}
+cd ${DIR}
+
+# the temp directory used, within $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}
+
+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
+
+    # add proxy settings into this script when you work behind a proxy
+    ${WORKSPACE}/test/csit/scripts/optf-has/has/has_proxy_settings.sh ${WORK_DIR}
+
+fi
+
+# check Dockerfile content
+cat ./Dockerfile
+
+# build aaisim
+docker build -t aaisim .  
+
+# run 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}"
+
+${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${AAISIM_IP} 8081
+
+# wait a while before continuing
+sleep 5
+
+echo "inspect docker things for tracing purpose"
+docker inspect aaisim
diff --git a/test/csit/scripts/optf-has/has/simulator_teardown_script.sh b/test/csit/scripts/optf-has/has/simulator_teardown_script.sh
new file mode 100755
index 000000000..e300a985a
--- /dev/null
+++ b/test/csit/scripts/optf-has/has/simulator_teardown_script.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# Copyright 2016-2017 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+echo "optf/has scripts docker containers killing";
+docker stop aaisim
+
+docker rm aaisim
+