diff options
| author |   ying.yunlong <ying.yunlong@zte.com.cn> | 2017-09-28 11:43:25 +0800 |
|---|---|---|
| committer | ying.yunlong <ying.yunlong@zte.com.cn> | 2017-09-28 11:57:07 +0800 |
| commit | 168b0021eddddef8e8d938fcb166993798f7d8f7 (patch) | |
| tree | f9b51d8da9603e7d0d0c7bad5c736c3994a66dcf /test | |
| parent | 4f7282bbb52c531b41a0d44bd49a2103e4ab49c4 (diff) | |
Fix vfc-gvnfm-vnflcm csit fail issue
Change-Id: If4b0c53ed09ab3ac9665d70f91a2044478b26a96
Issue-ID: VFC-459
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
Diffstat (limited to 'test')
| -rwxr-xr-x | test/csit/plans/vfc-gvnfm-vnflcm/sanity-check/setup.sh | 2 | ||||
| -rw-r--r-- | test/csit/tests/vfc/gvnfm-vnflcm/test.robot | 33 |
2 files changed, 8 insertions, 27 deletions
diff --git a/test/csit/plans/vfc-gvnfm-vnflcm/sanity-check/setup.sh b/test/csit/plans/vfc-gvnfm-vnflcm/sanity-check/setup.sh index 634c32722..c9900d246 100755 --- a/test/csit/plans/vfc-gvnfm-vnflcm/sanity-check/setup.sh +++ b/test/csit/plans/vfc-gvnfm-vnflcm/sanity-check/setup.sh @@ -58,4 +58,4 @@ docker cp vfc-vnflcm:/service/vfc/gvnfm/vnflcm/lcm/logs/runtime_lcm.log ./ cat runtime_lcm.log # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v VNFLCM_IP:${VNFLCM_IP}" +ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v VNFLCM_IP:${VNFLCM_IP} -v SCRIPTS:${SCRIPTS}" diff --git a/test/csit/tests/vfc/gvnfm-vnflcm/test.robot b/test/csit/tests/vfc/gvnfm-vnflcm/test.robot index 1324a1cc8..6a019624c 100644 --- a/test/csit/tests/vfc/gvnfm-vnflcm/test.robot +++ b/test/csit/tests/vfc/gvnfm-vnflcm/test.robot @@ -7,44 +7,25 @@ Library json Library HttpLibrary.HTTP *** Variables *** -@{return_ok_list}= 200 201 202 +@{return_ok_list}= 200 201 202 204 ${queryswagger_url} /api/vnflcm/v1/swagger.json ${create_vnf_url} /api/vnflcm/v1/vnf_instances ${delete_vnf_url} /api/vnflcm/v1/vnf_instances #json files -${create_vnf_json} ./jsoninput/create_vnf.json +${create_vnf_json} ${SCRIPTS}/../tests/vfc/gvnfm-vnflcm/jsoninput/create_vnf.json + +#global variables +${vnfInstId} *** Test Cases *** VnflcmSwaggerTest [Documentation] query swagger info vnflcm by MSB ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} + Create Session web_session http://${VNFLCM_IP}:8801 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 - -CreateVnfTest - [Documentation] Create Vnf function test - ${json_value}= json_from_file ${create_vnf_json} - ${json_string}= string_from_json ${json_value} - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - Set Request Body ${json_string} - ${resp}= Post Request web_session ${create_vnf_url} ${json_string} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code} - ${response_json} json.loads ${resp.content} - ${vnfInstId}= Convert To String ${response_json['vnfInstanceId']} - Set Global Variable ${vnfInstId} - -DeleteVnfTest - [Documentation] Delete Vnf function test - ${headers} Create Dictionary Content-Type=application/json Accept=application/json - Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers} - ${resp}= Delete Request web_session ${delete_vnf_url}/${vnfInstId} - ${responese_code}= Convert To String ${resp.status_code} - List Should Contain Value ${return_ok_list} ${responese_code}
\ No newline at end of file + Should Be Equal ${swagger_version} 2.0
\ No newline at end of file |