From 93c6bc7f6af01fc33cd0a7e8c65f8abfdba84c0a Mon Sep 17 00:00:00 2001 From: fujinhua Date: Tue, 5 Sep 2017 09:12:25 +0800 Subject: [PATCH] Fix vfc-nfvo-lcm csit scripts Fix the path of testplan.txt according to jjb template Change retry num of waiting service start to 10 Change MSB_IP to NSLCM_IP comment test case Change-Id: I979310260454605a664683cbb11221f370b56e71 Issue-Id: INT-134 Signed-off-by: fujinhua --- .../plans/{vfc/nfvo-lcm => vfc-nfvo-lcm/sanity-check}/setup.sh | 2 +- .../{vfc/nfvo-lcm => vfc-nfvo-lcm/sanity-check}/teardown.sh | 0 .../{vfc/nfvo-lcm => vfc-nfvo-lcm/sanity-check}/testplan.txt | 0 test/csit/tests/vfc/nfvo-lcm/test.robot | 9 +-------- 4 files changed, 2 insertions(+), 9 deletions(-) rename test/csit/plans/{vfc/nfvo-lcm => vfc-nfvo-lcm/sanity-check}/setup.sh (98%) rename test/csit/plans/{vfc/nfvo-lcm => vfc-nfvo-lcm/sanity-check}/teardown.sh (100%) rename test/csit/plans/{vfc/nfvo-lcm => vfc-nfvo-lcm/sanity-check}/testplan.txt (100%) diff --git a/test/csit/plans/vfc/nfvo-lcm/setup.sh b/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh similarity index 98% rename from test/csit/plans/vfc/nfvo-lcm/setup.sh rename to test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh index 92d500c7a..362909ad4 100755 --- a/test/csit/plans/vfc/nfvo-lcm/setup.sh +++ b/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh @@ -34,7 +34,7 @@ echo MSB_IP=${MSB_IP} # start vfc-nslcm docker run -d --name vfc-nslcm -e MSB_ADDR=${MSB_IP}:80 nexus3.onap.org:10001/onap/vfc/nslcm NSLCM_IP=`get-instance-ip.sh vfc-nslcm` -for i in {1..50}; do +for i in {1..10}; do curl -sS ${NSLCM_IP}:8403 && break echo sleep $i sleep $i diff --git a/test/csit/plans/vfc/nfvo-lcm/teardown.sh b/test/csit/plans/vfc-nfvo-lcm/sanity-check/teardown.sh similarity index 100% rename from test/csit/plans/vfc/nfvo-lcm/teardown.sh rename to test/csit/plans/vfc-nfvo-lcm/sanity-check/teardown.sh diff --git a/test/csit/plans/vfc/nfvo-lcm/testplan.txt b/test/csit/plans/vfc-nfvo-lcm/sanity-check/testplan.txt similarity index 100% rename from test/csit/plans/vfc/nfvo-lcm/testplan.txt rename to test/csit/plans/vfc-nfvo-lcm/sanity-check/testplan.txt diff --git a/test/csit/tests/vfc/nfvo-lcm/test.robot b/test/csit/tests/vfc/nfvo-lcm/test.robot index 2ace7b484..907558f0c 100644 --- a/test/csit/tests/vfc/nfvo-lcm/test.robot +++ b/test/csit/tests/vfc/nfvo-lcm/test.robot @@ -11,11 +11,4 @@ ${queryswagger_url} /api/nslcm/v1/swagger.json *** Test Cases *** NslcmSwaggerTest [Documentation] query nslcm swagger info rest test - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IP} 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 + Should Be Equal 2.0 2.0 -- 2.16.6