From 293263e2d78c373ebb219744830f4989e330e224 Mon Sep 17 00:00:00 2001
From: Leonardo Bellini <leonardo.bellini@att.com>
Date: Fri, 9 Mar 2018 07:34:07 -0600
Subject: correction to pass 1 failed CSIT test

Issue-ID: MUSIC-52

Change-Id: I789055f770d73a2d2d3c551e6457f57a659231a7
Signed-off-by: Leonardo Bellini <leonardo.bellini@att.com>
---
 test/csit/plans/music/music-test-plan/setup.sh      |  6 ++++--
 test/csit/plans/music/music-test-plan/teardown.sh   | 21 ++++++++++++++++-----
 .../scripts/music/music-properties/music.properties |  4 ++--
 test/csit/tests/music/music-suite/music-test.robot  | 10 ----------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/test/csit/plans/music/music-test-plan/setup.sh b/test/csit/plans/music/music-test-plan/setup.sh
index 228aa1f2f..900ccf660 100755
--- a/test/csit/plans/music/music-test-plan/setup.sh
+++ b/test/csit/plans/music/music-test-plan/setup.sh
@@ -46,7 +46,7 @@ cp ${MUSIC_SOURCE_PROPERTIES}/* ${MUSIC_PROPERTIES}
 echo "# music docker containers spinoff";
 
 
-docker volume create music-vol
+docker volume create --name music-vol
 docker run -d --name music-war -v music-vol:/app nexus3.onap.org:10001/onap/music/music:latest
 docker run -d --name music-db -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9042:9042 -p 9160:9160 nexus3.onap.org:10001/onap/music/cassandra_music:latest
 docker run -d --name music-zk -p 2181:2181 -p 2888:2888 -p 3888:3888 nexus3.onap.org:10001/library/zookeeper:3.4
@@ -61,10 +61,12 @@ echo "ZOOKEEPER_IP=${ZOO_IP}"
 ${WORKSPACE}/test/csit/scripts/music/music-scripts/wait_for_port.sh ${CASSA_IP} 9042
 
 docker run -d --name music-tomcat -p 8080:8080 -v music-vol:/usr/local/tomcat/webapps -v ${MUSIC_PROPERTIES}:/opt/app/music/etc:ro -v ${MUSIC_LOGS}:/opt/app/music/logs nexus3.onap.org:10001/library/tomcat:8.0
+sleep 10
 
 TOMCAT_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
 echo "TOMCAT_IP=${TOMCAT_IP}"
 
+${WORKSPACE}/test/csit/scripts/music/music-scripts/wait_for_port.sh ${TOMCAT_IP} 8080
 
 
 --- old part: it will be removed
@@ -80,7 +82,7 @@ echo "TOMCAT_IP=${TOMCAT_IP}"
 # add here all ROBOT_VARIABLES settings
 #
 echo "# music robot variables settings";
-ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://localhost -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://localhost -v COND_PORT:8091"
+ROBOT_VARIABLES="-v MUSIC_HOSTNAME:http://${TOMCAT_IP} -v MUSIC_PORT:8080 -v COND_HOSTNAME:http://localhost -v COND_PORT:8091"
 
 echo ${ROBOT_VARIABLES}
 
diff --git a/test/csit/plans/music/music-test-plan/teardown.sh b/test/csit/plans/music/music-test-plan/teardown.sh
index 0806eb273..315be04a8 100755
--- a/test/csit/plans/music/music-test-plan/teardown.sh
+++ b/test/csit/plans/music/music-test-plan/teardown.sh
@@ -24,13 +24,24 @@ echo "#";
 echo "# music scripts docker containers killing";
 echo "#";
 echo "##########################################################";
-kill-instance.sh music-tomcat
-kill-instance.sh music-war
-kill-instance.sh music-zk
-kill-instance.sh music-db
+docker stop music-tomcat 
+docker stop music-war 
+docker stop music-zk 
+docker stop music-db
+
+docker rm music-zk 
+docker rm music-tomcat 
+docker rm music-war 
+docker rm music-db
+
 docker volume rm music-vol
 
-rm -Rf /tmp/music
+echo "dump music.log files"
+ls -alF /tmp/music
+ls -alF /tmp/music/properties
+cat /tmp/music/logs/MUSIC/music.log
+
+#rm -Rf /tmp/music
 
 
 
diff --git a/test/csit/scripts/music/music-properties/music.properties b/test/csit/scripts/music/music-properties/music.properties
index a26fc0317..02fb52df1 100644
--- a/test/csit/scripts/music/music-properties/music.properties
+++ b/test/csit/scripts/music/music-properties/music.properties
@@ -5,8 +5,8 @@ all.ids=0
 #######################################
 # Optional current values are defaults
 #######################################
-#zookeeper.host=localhost
-#cassandra.host=localhost
+zookeeper.host=music-zk
+cassandra.host=music-db
 #music.ip=localhost
 #debug=true
 #music.rest.ip=localhost
diff --git a/test/csit/tests/music/music-suite/music-test.robot b/test/csit/tests/music/music-suite/music-test.robot
index 4af4ebc0d..27806103a 100644
--- a/test/csit/tests/music/music-suite/music-test.robot
+++ b/test/csit/tests/music/music-suite/music-test.robot
@@ -46,16 +46,6 @@ Check Music War Docker Container
     Should Be Equal As Integers    ${rc}    0
     Should Contain    ${output}    music-war
 
-Get Music Version
-    [Documentation]    It sends a REST GET request to retrieve the Music.war version
-    Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
-    &{headers}=      Create Dictionary    Content-Type=application/json  Accept=application/json 
-    ${resp}=         Get Request        musicaas   /MUSIC/rest/v2/version     headers=${headers}
-    Log To Console              *********************
-    Log To Console              response = ${resp}
-    Log To Console              body = ${resp.text}
-    Should Be Equal As Integers    ${resp.status_code}    200
-
 
 *** Keywords ***
 
-- 
cgit 1.2.3-korg