Add csit case of vfc-nfvo-lcm

Add case of call rest api by msb

Change-Id: I08b7b97ef65b34ecccdd12014c9489aec187d9e3
Issue-Id: INT-191
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh b/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh
index fafbe84..cad0f89 100755 (executable)
--- a/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh
+++ b/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh
@@ -28,7 +28,7 @@ docker run -d  -p 10081:10081  -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery
 MSB_DISCOVERY_IP=`get-instance-ip.sh msb_discovery`
 echo DISCOVERY_IP=${MSB_DISCOVERY_IP}
 
-docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
+docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP -e "ROUTE_LABELS=visualRange:1" --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
 MSB_IAG_IP=`get-instance-ip.sh msb_internal_apigateway`
 echo MSB_IAG_IP=${MSB_IAG_IP}
 
@@ -39,9 +39,9 @@ for i in {1..10}; do
     sleep $i
 done
 
-# wait for container initalization
-echo sleep 30
-sleep 30
+# Need some time so service info can be synced from discovery to api gateway
+echo sleep 60
+sleep 60
 
 # start vfc-nslcm
 docker run -d --name vfc-nslcm -v /var/lib/mysql -e MSB_ADDR=${MSB_DISCOVERY_IP}:10081 nexus3.onap.org:10001/onap/vfc/nslcm

diff --git a/test/csit/tests/vfc/nfvo-lcm/test.robot b/test/csit/tests/vfc/nfvo-lcm/test.robot
index 148856c..7f6a0d8 100644 (file)
--- a/test/csit/tests/vfc/nfvo-lcm/test.robot
+++ b/test/csit/tests/vfc/nfvo-lcm/test.robot
@@ -10,7 +10,7 @@ ${queryswagger_url}    /api/nslcm/v1/swagger.json
 
 *** Test Cases ***
 NslcmSwaggerTest
-    [Documentation]    query swagger info nslcm
+    [Documentation]    query swagger info of nslcm
     ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
     Create Session    web_session    http://${NSLCM_IP}:8403    headers=${headers}
     ${resp}=  Get Request    web_session    ${queryswagger_url}
@@ -19,3 +19,14 @@ NslcmSwaggerTest
     ${response_json}    json.loads    ${resp.content}
     ${swagger_version}=    Convert To String      ${response_json['swagger']}
     Should Be Equal    ${swagger_version}    2.0
+
+NslcmSwaggerByMSBTest
+    [Documentation]    query swagger info of nslcm by MSB
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session    web_session    http://${MSB_IAG_IP}:80    headers=${headers}
+    ${resp}=  Get Request    web_session    ${queryswagger_url}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
+    ${response_json}    json.loads    ${resp.content}
+    ${swagger_version}=    Convert To String      ${response_json['swagger']}
+    Should Be Equal    ${swagger_version}    2.0
\ No newline at end of file