diff options
| author |   yunlong ying <ying.yunlong@zte.com.cn> | 2017-09-05 11:52:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-05 11:52:41 +0000 |
| commit | 3fe68e0ad138da337d1b4055c76b115b9b3300f0 (patch) | |
| tree | a41f67ee40cf5ab5ce9c13f3a609545e759ce56d | |
| parent | 5a688a576dcad84d3b930b9af48207e13fd0a9a5 (diff) | |
| parent | 93c6bc7f6af01fc33cd0a7e8c65f8abfdba84c0a (diff) | |
Merge "Fix vfc-nfvo-lcm csit scripts"
| -rwxr-xr-x | test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh (renamed from test/csit/plans/vfc/nfvo-lcm/setup.sh) | 2 | ||||
| -rwxr-xr-x | test/csit/plans/vfc-nfvo-lcm/sanity-check/teardown.sh (renamed from test/csit/plans/vfc/nfvo-lcm/teardown.sh) | 0 | ||||
| -rw-r--r-- | test/csit/plans/vfc-nfvo-lcm/sanity-check/testplan.txt (renamed from test/csit/plans/vfc/nfvo-lcm/testplan.txt) | 0 | ||||
| -rw-r--r-- | test/csit/tests/vfc/nfvo-lcm/test.robot | 9 |
4 files changed, 2 insertions, 9 deletions
diff --git a/test/csit/plans/vfc/nfvo-lcm/setup.sh b/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 index c74850d36..c74850d36 100755 --- a/test/csit/plans/vfc/nfvo-lcm/teardown.sh +++ b/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 index fc261e13c..fc261e13c 100644 --- a/test/csit/plans/vfc/nfvo-lcm/testplan.txt +++ b/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 |