From: Dileep Ranganathan <dileep.ranganathan@intel.com>
Date: Mon, 5 Nov 2018 15:26:32 +0000 (-0800)
Subject: Remove Busybox netcat check for music-db
X-Git-Tag: 3.0.0-ONAP~4
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=integration%2Fcsit.git;a=commitdiff_plain;h=72141ca7038d1ae5657596e4db1e1f55eef7e5b9

Remove Busybox netcat check for music-db

Change-Id: I27d035145bdc1ef6f727ad92afc21f35ef3b2f21
Issue-ID: MUSIC-176
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
---

diff --git a/scripts/optf-has/has/music_script.sh b/scripts/optf-has/has/music_script.sh
index ba37d901..4257dad7 100755
--- a/scripts/optf-has/has/music_script.sh
+++ b/scripts/optf-has/has/music_script.sh
@@ -66,17 +66,15 @@ docker run -d --name music-db --network music-net -p "7000:7000" -p "7001:7001"
 -v $MUSIC_TRIGGER_DIR/$TRIGGER_JAR:/etc/cassandra/triggers/$TRIGGER_JAR \
 ${CASS_IMG};
 
+# See if cassandra is up.
+echo "########## Running Test to see if Cassandra is up ##########"
 CASSA_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-db`
 echo "CASSANDRA_IP=${CASSA_IP}"
 ${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042
 
-# See if cassandra is up.
-echo "########## Running Test to see if Cassandra is up ##########"
-docker run --name music-casstest --network music-net \
-$BUSYBOX_IMG sh -c "until nc -z music-db 9042 && echo "success"; do echo 'No connection .. Sleeping for $TT seconds';sleep $TT; done;"
-
 # Sleep 60 seconds to ensure Cassandra is up and running.
 sleep 60;
+
 # Check to see if Keyspaces are there.
 docker exec music-db cqlsh -u cassandra -p cassandra -e "DESCRIBE keyspaces;"
 
diff --git a/scripts/optf-has/has/music_teardown_script.sh b/scripts/optf-has/has/music_teardown_script.sh
index e05ef9d1..2e7d707b 100755
--- a/scripts/optf-has/has/music_teardown_script.sh
+++ b/scripts/optf-has/has/music_teardown_script.sh
@@ -40,14 +40,12 @@ docker stop music-tomcat
 docker stop music-war
 docker stop music-zk
 docker stop music-job
-docker stop music-casstest
 docker stop music-db
 
 docker rm music-zk
 docker rm music-tomcat
 docker rm music-war
 docker rm music-job
-docker rm music-casstest
 docker rm music-db
 
 docker network rm music-net;