diff options
| author |   fujinhua <fu.jinhua@zte.com.cn> | 2018-08-08 16:45:33 +0800 |
|---|---|---|
| committer | fujinhua <fu.jinhua@zte.com.cn> | 2018-08-08 16:45:33 +0800 |
| commit | 7e9188b57abc8588e51e8b86204aa718640170cc (patch) | |
| tree | 4c1c1ff4950e2a599079bad499cecc05ef5138fc /test/csit | |
| parent | a01695e3c51316a4a9eb9aa7dc1ed21eccd550c7 (diff) | |
Add db component when exec VFC CSIT
Change-Id: I53a54e1a3ba4f32f16f86ee7d4a9fa4c58810302
Issue-ID: INT-613
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
Diffstat (limited to 'test/csit')
| -rwxr-xr-x | test/csit/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh | 13 | ||||
| -rwxr-xr-x | test/csit/plans/vfc-gvnfm-vnfres/sanity-check/teardown.sh | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh b/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh index e976f9281..a0ea986df 100755 --- a/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh +++ b/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/setup.sh @@ -31,6 +31,10 @@ docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY MSB_IAG_IP=`get-instance-ip.sh msb_internal_apigateway` echo MSB_IAG_IP=${MSB_IAG_IP} +docker run -d -p 3306:3306 --name vfc-db nexus3.onap.org:10001/onap/vfc/db +VFC_DB_IP=`get-instance-ip.sh vfc-db` +echo VFC_DB_IP=${VFC_DB_IP} + # Wait for initialization(8500 Consul, 10081 Service Registration & Discovery, 80 api gateway) for i in {1..10}; do curl -sS -m 1 ${MSB_CONSUL_IP}:8500 && curl -sS -m 1 ${MSB_DISCOVERY_IP}:10081 && curl -sS -m 1 ${MSB_IAG_IP}:80 && break @@ -38,11 +42,18 @@ for i in {1..10}; do sleep $i done +# Wait for initialization(3306 DB) +for i in {1..3}; do + curl -sS -m 1 ${VFC_DB_IP}:3306 && break + echo sleep $i + sleep $i +done + # wait for container initalization echo sleep 60 sleep 60 # start vfc-vnfres -docker run -d --name vfc-vnfres -v /var/lib/mysql -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/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` # Wait for initialization diff --git a/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/teardown.sh b/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/teardown.sh index edd857da6..09db55b5a 100755 --- a/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/teardown.sh +++ b/test/csit/plans/vfc-gvnfm-vnfres/sanity-check/teardown.sh @@ -19,4 +19,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-vnfres |