diff options
| author |   Daniel Rose <dr695h@att.com> | 2018-08-28 15:50:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-08-28 15:50:45 +0000 |
| commit | c43172bf0403a08be70ac199a18e0ed044c14782 (patch) | |
| tree | 63713d2e43a3ac3ee6dd6c99ee0a6eadcd647c94 | |
| parent | 216cf70376974e9e1e1434a55537b0c28bbbe7fc (diff) | |
| parent | 975687992d1dbf86f6b2a4cf3f5fe63ff0488a72 (diff) | |
Merge "Updates for SO instantie tests"
| -rw-r--r-- | robot/resources/so_interface.robot | 17 | ||||
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 3 |
2 files changed, 17 insertions, 3 deletions
diff --git a/robot/resources/so_interface.robot b/robot/resources/so_interface.robot index 1116281f..8afcd593 100644 --- a/robot/resources/so_interface.robot +++ b/robot/resources/so_interface.robot @@ -45,8 +45,8 @@ Run MSO Get ModelInvariantId [Arguments] ${service_model_name} ${vf_module_label}=NULL ${param_dict}= Create Dictionary serviceModelName ${service_model_name} ${param}= Evaluate urllib.urlencode(${param_dict}) urllib - ${data_path}= Catenate SEPARATOR= /onap/so/catalog/v2/serviceVnfs? ${param} - ${resp}= Run MSO Get Request ${data_path} + ${data_path}= Catenate SEPARATOR= /ecomp/mso/catalog/v2/serviceVnfs? ${param} + ${resp}= Run MSO Catalog Get Request ${data_path} Log ${resp.json()} # ${resp.json()['serviceVnfs'][0]['vfModules'][0]['vfModuleLabel'] should be 'base_vpkg' ${model_invariant_id}= Set Variable NULL @@ -69,6 +69,19 @@ Run MSO Get Request Log Received response from mso ${resp.text} [Return] ${resp} +Run MSO Catalog Get Request + [Documentation] Runs an MSO get request + [Arguments] ${data_path} ${accept}=application/json + ${auth}= Create List ${GLOBAL_MSO_CATDB_USERNAME} ${GLOBAL_MSO_PASSWORD} + Log Creating session ${SO_CATDB_ENDPOINT} + ${session}= Create Session so_catdb ${SO_CATDB_ENDPOINT} auth=${auth} + ${uuid}= Generate UUID + ${headers}= Create Dictionary Accept=${accept} Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} + ${resp}= Get Request so_catdb ${data_path} headers=${headers} + Log Received response from so_catdb ${resp.text} + [Return] ${resp} + + Poll MSO Get Request [Documentation] Runs an MSO get request until a certain status is received. valid values are COMPLETE [Arguments] ${data_path} ${status} diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 53d56962..3a9c5570 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -80,7 +80,8 @@ Orchestrate VNF \ VLB Closed Loop Hack ${service} ${generic_vnf} ${closedloop_vf_module} \ Set Test Variable ${STACK_NAME} ${vf_module_name} \ Append To List ${STACK_NAMES} ${STACK_NAME} - \ Run Keyword and Ignore Error Execute Heatbridge ${vf_module_name} ${service_instance_id} ${vnf} + # TODO: Need to look at a better way to default ipv4_oam_interface search for Heatbridge + \ Run Keyword and Ignore Error Execute Heatbridge ${vf_module_name} ${service_instance_id} ${vnf} ipv4_oam_interface \ Run Keyword and Ignore Error Validate VF Module ${vf_module_name} ${vnf} [Return] ${vf_module_name} ${service} |