aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryunlong ying <ying.yunlong@zte.com.cn>2019-04-16 07:38:04 +0000
committerGerrit Code Review <gerrit@onap.org>2019-04-16 07:38:04 +0000
commit97d0f93f9f5e172aa54aa1911b157f4f589380aa (patch)
treed43e6f22c2f45cfdf150f6524ab0c00685612edc
parent9ae1de7843a533cc1cc7252379ab6dea14c3eda5 (diff)
parentfee5fb03594f9f79b516978b0dfd9dd4d7815d4c (diff)
Merge "Update cist sh for vnfres"
-rwxr-xr-xplans/vfc-gvnfm-vnfres/sanity-check/setup.sh12
-rwxr-xr-xplans/vfc-gvnfm-vnfres/sanity-check/teardown.sh1
2 files changed, 13 insertions, 0 deletions
diff --git a/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh b/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh
index a0ea986d..34be3c21 100755
--- 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 09db55b5..8ca66766 100755
--- 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