diff options
| -rw-r--r-- | robot/resources/aai/create_complex.robot | 7 | ||||
| -rw-r--r-- | robot/resources/appc_interface.robot | 2 | ||||
| -rw-r--r-- | robot/resources/json_templater.robot | 9 | ||||
| -rw-r--r-- | robot/resources/mso_interface.robot | 6 | ||||
| -rw-r--r-- | robot/resources/openstack/keystone_interface.robot | 2 | ||||
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 1 |
6 files changed, 6 insertions, 21 deletions
diff --git a/robot/resources/aai/create_complex.robot b/robot/resources/aai/create_complex.robot index e1cc2271..185d44d5 100644 --- a/robot/resources/aai/create_complex.robot +++ b/robot/resources/aai/create_complex.robot @@ -60,12 +60,7 @@ Get Complex Get Complexes [Documentation] Return all complexes - [Arguments] ${resp}= Run A&AI Get Request ${COMPLEX_INDEX_PATH}${ROOT_COMPLEXES_PATH} Should Be Equal As Strings ${resp.status_code} 200 Log ${resp.json()} - [Return] ${resp.json()} - - - - + [Return] ${resp.json()}
\ No newline at end of file diff --git a/robot/resources/appc_interface.robot b/robot/resources/appc_interface.robot index 520737db..5c3d8636 100644 --- a/robot/resources/appc_interface.robot +++ b/robot/resources/appc_interface.robot @@ -52,5 +52,5 @@ Create Mount Point In APPC ${template}= OperatingSystem.Get File ${APPC_MOUNT_XML} ${data}= Template String ${template} ${dict} ${resp}= Run APPC Put Request ${APPC_INDEX PATH}${APPC_CREATE_MOUNTPOINT_PATH}${nodeid} ${data} - Should Be True 200 <= ${resp.status_code} < 300 + Should Be True 200 <= ${resp.status_code} < 300 [Return] ${resp} diff --git a/robot/resources/json_templater.robot b/robot/resources/json_templater.robot index 4788fe57..6a5ca171 100644 --- a/robot/resources/json_templater.robot +++ b/robot/resources/json_templater.robot @@ -18,11 +18,4 @@ Fill JSON Template File [Arguments] ${json_file} ${arguments} ${json}= OperatingSystem.Get File ${json_file} ${returned_json}= Fill JSON Template ${json} ${arguments} - [Return] ${returned_json} - -Encode String - [Documentation] Encodes String - [Arguments] ${json} - ${returned_string}= string encoder ${json} - log ${returned_string} - [Return] ${returned_string}
\ No newline at end of file + [Return] ${returned_json}
\ No newline at end of file diff --git a/robot/resources/mso_interface.robot b/robot/resources/mso_interface.robot index db776d4d..49965c89 100644 --- a/robot/resources/mso_interface.robot +++ b/robot/resources/mso_interface.robot @@ -66,15 +66,11 @@ Run MSO Post request Run MSO Delete request [Documentation] Runs an MSO Delete request [Arguments] ${data_path} ${data} - sleep 2 ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD} Log Creating session ${MSO_ENDPOINT} ${session}= Create Session mso ${MSO_ENDPOINT} auth=${auth} ${uuid}= Generate UUID ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - log ${data} - ${data1} Encode String ${data} - log ${data1} - ${resp}= Delete Request mso ${data_path} ${data1} headers=${headers} + ${resp}= Delete Request mso ${data_path} ${data} headers=${headers} Log Received response from mso ${resp.text} [Return] ${resp} diff --git a/robot/resources/openstack/keystone_interface.robot b/robot/resources/openstack/keystone_interface.robot index e51e3db8..4749eb08 100644 --- a/robot/resources/openstack/keystone_interface.robot +++ b/robot/resources/openstack/keystone_interface.robot @@ -58,7 +58,7 @@ Get Openstack Credentials Get Keystone Url And Path [Documentation] Handle arbitrary keystone identiit url. Add v2.0 if not present. - ${pieces}= URL Parse ${GLOBAL_INJECTED_KEYSTONE} + ${pieces}= Url Parse ${GLOBAL_INJECTED_KEYSTONE} ${url}= Catenate ${pieces.scheme}://${pieces.netloc} ${version}= Evaluate '' ${version}= Set Variable If '${OPENSTACK_KEYSTONE_API_VERSION}' not in '${pieces.path}' ${OPENSTACK_KEYSTONE_API_VERSION} ${version} diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 807647db..38e3c5f9 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -22,6 +22,7 @@ Library OpenstackLibrary Library ExtendedSelenium2Library Library UUID Library Collections +Library JSONUtils |