From 2c7068ead3386a59bc15fee8b6f9a2fef3baf133 Mon Sep 17 00:00:00 2001
From: fengyuanxing <feng.yuanxing@zte.com.cn>
Date: Mon, 11 Sep 2017 13:25:07 +0800
Subject: Modify the parameters of docker script and robot

Change-Id: I0731e2a43d567d6e2bb9b2a00994134a4cac1fd7
Issue-Id: INT-193
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
---
 .../plans/vfc-nfvo-catalog/sanity-check/setup.sh   | 23 +++++++++++++++++-----
 test/csit/tests/vfc/nfvo-catalog/test.robot        |  2 +-
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'test')

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 524a4d866..6374b88ba 100644
--- a/test/csit/plans/vfc-nfvo-catalog/sanity-check/setup.sh
+++ b/test/csit/plans/vfc-nfvo-catalog/sanity-check/setup.sh
@@ -20,19 +20,32 @@
 #login to the onap nexus docker repo
 docker login -u docker -p docker nexus3.onap.org:10001
 
-# Start MSB
-docker run -d -p 8500:8500 --name msb_consul nexus3.onap.org:10001/onap/msb/msb_base
+# start msb
+docker run -d -p 8500:8500 --name msb_consul consul
 CONSUL_IP=`get-instance-ip.sh msb_consul`
 echo CONSUL_IP=${CONSUL_IP}
+
 docker run -d -p 10081:10081 -e CONSUL_IP=$CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
 DISCOVERY_IP=`get-instance-ip.sh msb_discovery`
 echo DISCOVERY_IP=${DISCOVERY_IP}
-docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
+
+docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP -e "ROUTE_LABELS=visualRange:1" --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
 MSB_IP==`get-instance-ip.sh msb_internal_apigateway`
 echo MSB_IP=${MSB_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
+    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 -e MSB_ADDR=${MSB_IP}:80 nexus3.onap.org:10001/onap/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
 CATALOG_IP=`get-instance-ip.sh vfc-catalog`
 for i in {1..10}; do
     curl -sS ${CATALOG_IP}:8806 && break
@@ -41,4 +54,4 @@ for i in {1..10}; do
 done
 
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v CATALOG_IP:${CATALOG_IP}"
+ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v CATALOG_IP:${CATALOG_IP} -v MSB_DISCOVERY_IP:${DISCOVERY_IP}"
diff --git a/test/csit/tests/vfc/nfvo-catalog/test.robot b/test/csit/tests/vfc/nfvo-catalog/test.robot
index a23128c90..99dff9bd2 100644
--- a/test/csit/tests/vfc/nfvo-catalog/test.robot
+++ b/test/csit/tests/vfc/nfvo-catalog/test.robot
@@ -13,7 +13,7 @@ ${queryNSPackages_url}     /api/catalog/v1/nspackages
 *** Test Cases ***
 GetVNFPackages
     ${headers}            Create Dictionary    Content-Type=application/json    Accept=application/json
-    Create Session        web_session          http://${CATALOG_IP}             headers=${headers}
+    Create Session        web_session          http://${CATALOG_IP}:8806             headers=${headers}
     ${resp}=              Get Request          web_session                      ${queryVNFPackage_url}
     ${responese_code}=    Convert To String    ${resp.status_code}
     List Should Contain Value    ${return_ok_list}   ${responese_code}
-- 
cgit 1.2.3-korg