X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=scripts%2Fvid%2Fstart_vid_containers.sh;h=c1c09bcd13f340c7f8c006d92fb282791892a530;hb=90a2d4da62a04d4aaac556b28561bdc4534a6be7;hp=c4bdae2de26ff6a3e4eba252151e177b16d9b274;hpb=9abb61ca2cea1907cab2cec312d6dca6e53a93cd;p=integration%2Fcsit.git

diff --git a/scripts/vid/start_vid_containers.sh b/scripts/vid/start_vid_containers.sh
index c4bdae2d..c1c09bcd 100644
--- a/scripts/vid/start_vid_containers.sh
+++ b/scripts/vid/start_vid_containers.sh
@@ -17,24 +17,39 @@
 # 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.
+#
+# Modifications copyright (c) 2018 Nokia Intellectual Property
 # ============LICENSE_END============================================
 # ===================================================================
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
-echo "This is ${WORKSPACE}/test/csit/scripts/vid/start_vid_containers.sh"
+echo "This is ${WORKSPACE}/scripts/vid/start_vid_containers.sh"
 
 export IP=`ifconfig eth0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'`
 
-cd ${WORKSPACE}/test/csit/tests/vid/resources
+cd ${WORKSPACE}/tests/vid/resources
 docker-compose up -d --build
 
 # WAIT 5 minutes maximum and test every 5 seconds if VID up using HealthCheck API
 
-TIME_OUT=1200
+TIME_OUT=300
 INTERVAL=5
 TIME=0
+
+	for i in {1..10}; do
+	    if [ $(docker inspect -f '{{ .State.Running }}' vid-server) ]
+	    then
+		echo "VID service is running"
+		VID_DOCKER_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vid-server)
+		break
+	    else
+		echo "Waiting for vid-server docker initialization... $i"
+		sleep $i
+	    fi
+	done
+
 while [ "$TIME" -lt "$TIME_OUT" ]; do
-  response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://localhost:8080/vid/healthCheck); echo $response
+  response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://"$VID_DOCKER_IP":8080/vid/healthCheck); echo $response
 
   if [ "$response" == "200" ]; then
     echo VID and its database well started in $TIME seconds