From 50ee9d628b2da68cc72933b00a699bf855193eed Mon Sep 17 00:00:00 2001
From: Leonardo Bellini <leonardo.bellini@att.com>
Date: Thu, 15 Mar 2018 04:39:25 -0500
Subject: Integrate optf-has with music - first step

Issue-ID: OPTFRA-186

Change-Id: I0e92332af26105273db2a07e2d9bf04f0980338c
Signed-off-by: Leonardo Bellini <leonardo.bellini@att.com>
---
 test/csit/plans/optf-has/has/setup.sh    | 29 ++++++++++++-----------------
 test/csit/plans/optf-has/has/teardown.sh | 30 +++++++++++-------------------
 2 files changed, 23 insertions(+), 36 deletions(-)

(limited to 'test/csit/plans')

diff --git a/test/csit/plans/optf-has/has/setup.sh b/test/csit/plans/optf-has/has/setup.sh
index 347399bf8..f2ae3c78b 100755
--- a/test/csit/plans/optf-has/has/setup.sh
+++ b/test/csit/plans/optf-has/has/setup.sh
@@ -15,44 +15,39 @@
 # limitations under the License.
 #
 
+
+#
+# add here eventual scripts needed for music
+#
+echo "# music scripts calling";
+source ${WORKSPACE}/test/csit/scripts/optf-has/has/music_script.sh
+
+
 #
 # add here eventual scripts needed for optf/has
 #
-echo "##########################################################";
-echo "#";
 echo "# optf/has scripts calling";
-echo "#";
-echo "##########################################################";
 source ${WORKSPACE}/test/csit/scripts/optf-has/has/has_script.sh
 
 #
 # add here below the start of all docker containers needed for optf/has CSIT testing
 #
-echo "##########################################################";
-echo "#";
 echo "# optf/has scripts docker containers spinoff";
-echo "#";
-echo "##########################################################";
 
 #
 # add here all the configuration steps eventually needed to be carried out for optf/has CSIT testing
 #
-echo "##########################################################";
-echo "#";
 echo "# optf/has configuration step";
-echo "#";
-echo "##########################################################";
 
 
 #
 # add here all ROBOT_VARIABLES settings
 #
-echo "##########################################################";
-echo "#";
 echo "# optf/has robot variables settings";
-echo "#";
-echo "##########################################################";
-ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://localhost -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://localhost -v COND_PORT:8091"
+echo "conductor ip = ${COND_IP}"
+echo "music ip = ${TOMCAT_IP}"
+
+ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://${TOMCAT_IP} -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://${COND_IP} -v COND_PORT:8091"
 
 echo ${ROBOT_VARIABLES}
 
diff --git a/test/csit/plans/optf-has/has/teardown.sh b/test/csit/plans/optf-has/has/teardown.sh
index 80a85f9a9..f4a91f9d5 100755
--- a/test/csit/plans/optf-has/has/teardown.sh
+++ b/test/csit/plans/optf-has/has/teardown.sh
@@ -19,25 +19,17 @@
 #
 # add here below the killing of all docker containers used for optf/has CSIT testing
 #
-echo "##########################################################";
-echo "#";
+
+#
 echo "# optf/has scripts docker containers killing";
-echo "#";
-echo "##########################################################";
-#kill-instance.sh cond-api
-#kill-instance.sh cond-solv
-#kill-instance.sh cond-cont
-#kill-instance.sh cond-data
-#kill-instance.sh cond-resv
-docker stop cond-api
-docker stop cond-solv
-docker stop cond-cont
-docker stop cond-data
-docker stop cond-resv
+#
+echo "# optf/has scripts calling";
+source ${WORKSPACE}/test/csit/scripts/optf-has/has/has_teardown_script.sh
+
 
-docker rm cond-api
-docker rm cond-solv
-docker rm cond-cont
-docker rm cond-data
-docker rm cond-resv
+#
+echo "# optf/has scripts docker containers killing";
+#
+echo "# optf/has scripts calling";
+source ${WORKSPACE}/test/csit/scripts/optf-has/has/music_teardown_script.sh
 
-- 
cgit 1.2.3-korg