aboutsummaryrefslogtreecommitdiffstats
path: root/test/csit/plans/vfc-nfvo-catalog
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2018-08-08 14:46:11 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2018-08-08 14:46:11 +0800
commitb1d068efbbe88c31dc74c7b4115e72f9961ff1be (patch)
treeed39dac1de84808a05509af1672a77960f76054d /test/csit/plans/vfc-nfvo-catalog
parenta02eada5a16a5f67f02212ced661f1ddae306a9f (diff)
Add db component when exec VFC CSIT
Change-Id: Ibcfec9c79c6c722bc35d459424ab73af0b5cc025 Issue-ID: INT-613 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
Diffstat (limited to 'test/csit/plans/vfc-nfvo-catalog')
-rw-r--r--test/csit/plans/vfc-nfvo-catalog/sanity-check/setup.sh13
-rw-r--r--test/csit/plans/vfc-nfvo-catalog/sanity-check/teardown.sh1
2 files changed, 13 insertions, 1 deletions
diff --git a/test/csit/plans/vfc-nfvo-catalog/sanity-check/setup.sh b/test/csit/plans/vfc-nfvo-catalog/sanity-check/setup.sh
index 3576e234d..d839fa554 100644
--- a/test/csit/plans/vfc-nfvo-catalog/sanity-check/setup.sh
+++ b/test/csit/plans/vfc-nfvo-catalog/sanity-check/setup.sh
@@ -33,6 +33,10 @@ docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP -e "
MSB_IP==`get-instance-ip.sh msb_internal_apigateway`
echo MSB_IP=${MSB_IP}
+docker run -d -p 3306:3306 --name vfc-db -v /var/lib/mysql 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 ${CONSUL_IP}:8500 && curl -sS -m 1 ${DISCOVERY_IP}:10081 && curl -sS -m 1 ${MSB_IP}:80 && break
@@ -40,12 +44,19 @@ 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
+
# Need some time so service info can be synced from discovery to api gateway
echo sleep 60
sleep 60
# start vfc-catalog
-docker run -d --name vfc-catalog -v /var/lib/mysql -e MSB_ADDR=${DISCOVERY_IP}:10081 nexus3.onap.org:10001/onap/vfc/catalog
+docker run -d --name vfc-catalog -v /var/lib/mysql -e MSB_ADDR=${DISCOVERY_IP}:10081 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/vfc/catalog
CATALOG_IP=`get-instance-ip.sh vfc-catalog`
for i in {1..10}; do
curl -sS -m 1 ${CATALOG_IP}:8806 && break
diff --git a/test/csit/plans/vfc-nfvo-catalog/sanity-check/teardown.sh b/test/csit/plans/vfc-nfvo-catalog/sanity-check/teardown.sh
index 68d5b60e4..d498e34c6 100644
--- a/test/csit/plans/vfc-nfvo-catalog/sanity-check/teardown.sh
+++ b/test/csit/plans/vfc-nfvo-catalog/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-catalog