Merge "Update cist sh for vnfres"

diff --git a/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh b/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh
index a0ea986..34be3c2 100755 (executable)
--- a/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh
+++ b/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh
@@ -52,6 +52,18 @@ done
 # wait for container initalization
 echo sleep 60
 sleep 60
+
+# start vfc-vnflcm
+docker run -d --name vfc-vnflcm -e MSB_ADDR=${MSB_IAG_IP}:80 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/vfc/vnflcm
+VNFLCM_IP=`get-instance-ip.sh vfc-vnflcm`
+
+# Wait for initialization
+for i in {1..10}; do
+    curl -sS -m 1 ${VNFLCM_IP}:8801 && break
+    echo sleep $i
+    sleep $i
+done
+
 # start vfc-vnfres
 docker run -d --name vfc-vnfres -e MSB_ADDR=${MSB_IAG_IP}:80 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/vfc/vnfres
 VNFRES_IP=`get-instance-ip.sh vfc-vnfres`

diff --git a/plans/vfc-gvnfm-vnfres/sanity-check/teardown.sh b/plans/vfc-gvnfm-vnfres/sanity-check/teardown.sh
index 09db55b..8ca6676 100755 (executable)
--- a/plans/vfc-gvnfm-vnfres/sanity-check/teardown.sh
+++ b/plans/vfc-gvnfm-vnfres/sanity-check/teardown.sh
@@ -20,4 +20,5 @@ kill-instance.sh msb_internal_apigateway
 kill-instance.sh msb_discovery
 kill-instance.sh msb_consul
 kill-instance.sh vfc-db
+kill-instance.sh vfc-vnflcm
 kill-instance.sh vfc-vnfres