4 files changed, 61 insertions, 22 deletions
diff --git a/test/csit/plans/music/music-test-plan/setup.sh b/test/csit/plans/music/music-test-plan/setup.sh
index 517837c9a..228aa1f2f 100755
--- a/test/csit/plans/music/music-test-plan/setup.sh
+++ b/test/csit/plans/music/music-test-plan/setup.sh
@@ -18,40 +18,68 @@
 #
 # add here eventual scripts needed for music
 #
-echo "##########################################################";
-echo "#";
 echo "# music scripts calling";
-echo "#";
-echo "##########################################################";
 source ${WORKSPACE}/test/csit/scripts/music/music-scripts/music_script.sh
 
 #
-# add here below the start of all docker containers needed for music CSIT testing
+# add here all the configuration steps eventually needed to be carried out for music CSIT testing
 #
-echo "##########################################################";
-echo "#";
-echo "# music scripts docker containers spinoff";
-echo "#";
-echo "##########################################################";
+echo "# music configuration step";
+MUSIC_SOURCE_PROPERTIES=${WORKSPACE}/test/csit/scripts/music/music-properties
+MUSIC_PROPERTIES=/tmp/music/properties
+MUSIC_LOGS=/tmp/music/logs
+
+mkdir -p ${MUSIC_PROPERTIES}
+mkdir -p ${MUSIC_LOGS}
+
+cp ${MUSIC_SOURCE_PROPERTIES}/* ${MUSIC_PROPERTIES}
+
+#docker cp /home/lb7254/integration/test/csit/scripts/music/music-scripts/music_init.cql cassandra:/tmp/music_init.cql
+#docker cp ${WORKSPACE}/test/csit/scripts/music/music-scripts/music_init.cql cassandra:/tmp/music_init.cql
+#docker exec -it cassandra /usr/bin/cqlsh -umusic -pmusic  -f /tmp/music_init.cql
+
+
 
 #
-# add here all the configuration steps eventually needed to be carried out for music CSIT testing
+# add here below the start of all docker containers needed for music CSIT testing
 #
-echo "##########################################################";
-echo "#";
-echo "# music configuration step";
-echo "#";
-echo "##########################################################";
+echo "# music docker containers spinoff";
+
+
+docker volume create 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
+sleep 30
+
+CASSA_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-db`
+echo "CASSANDRA_IP=${CASSA_IP}"
+
+ZOO_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-zk`
+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
+
+TOMCAT_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-tomcat`
+echo "TOMCAT_IP=${TOMCAT_IP}"
+
+
+
+--- old part: it will be removed
+#docker run --name cassandra -d -p 9042:9042 -p 7000:7000 -p 7001:7001 -p 7199:7199 -p 9160:9160 nexus3.onap.org:10001/library/cassandra 
+#docker run --name zookeeper -d -p 2181:2181 -p 2888:2888 -p 3888:3888 nexus3.onap.org:10001/library/zookeeper
+#docker run --name music -d -v /app nexus3.onap.org:10001/music
+#docker run --name tomcat -d -p 8080:8080 --volumes-from music nexus3.onap.org:10001/library/tomcat
+
+
 
 
 #
 # add here all ROBOT_VARIABLES settings
 #
-echo "##########################################################";
-echo "#";
 echo "# music 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 ${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 884a64f71..0806eb273 100755
--- a/test/csit/plans/music/music-test-plan/teardown.sh
+++ b/test/csit/plans/music/music-test-plan/teardown.sh
@@ -24,5 +24,15 @@ echo "#";
 echo "# music scripts docker containers killing";
 echo "#";
 echo "##########################################################";
-# kill-instance.sh <dockercontainername>
+kill-instance.sh music-tomcat
+kill-instance.sh music-war
+kill-instance.sh music-zk
+kill-instance.sh music-db
+docker volume rm music-vol
+
+rm -Rf /tmp/music
+
+
+
+
 
diff --git a/test/csit/plans/sdnc/healthcheck/teardown.sh b/test/csit/plans/sdnc/healthcheck/teardown.sh
index 925e7b732..dd465bb33 100644
--- a/test/csit/plans/sdnc/healthcheck/teardown.sh
+++ b/test/csit/plans/sdnc/healthcheck/teardown.sh
@@ -22,5 +22,6 @@ kill-instance.sh sdnc_dgbuilder_container
 kill-instance.sh sdnc_portal_container
 kill-instance.sh sdnc_db_container
 kill-instance.sh sdnc_ueblistener_container
+kill-instance.sh sdnc_dmaaplistener_container
 
 # $WORKSPACE/archives/appc deleted with archives folder when tests starts so we keep it at the end for debugging
diff --git a/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh b/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh
index e04feac41..1c3e4e83a 100644
--- a/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh
+++ b/test/csit/plans/vnfsdk-refrepo/sanity-check/setup.sh
@@ -23,7 +23,7 @@ docker run -d -i -t --name=postgres   -p 5432:5432 nexus3.onap.org:10001/onap/re
 POSTGRES=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' postgres`
 
 #Start market place
-docker run -d -i -t --name=refrepo -e POSTGRES_IP=$POSTGRES  -p 8702:8702 nexus3.onap.org:10001/onap/refrepo:1.0-STAGING-latest
+docker run -d -i -t --name=refrepo -e POSTGRES_IP=$POSTGRES  -p 8702:8702 nexus3.onap.org:10001/onap/refrepo:1.1-STAGING-latest
 
 # Wait for Market place initialization
 echo Wait for VNF Repository initialization