diff options
Diffstat (limited to 'robot')
| -rw-r--r-- | robot/assets/service_mappings.py | 2 | ||||
| -rw-r--r-- | robot/assets/templates/asdc/feature_group.template | 5 | ||||
| -rw-r--r-- | robot/resources/asdc_interface.robot | 4 | ||||
| -rw-r--r-- | robot/resources/global_properties.robot | 2 | ||||
| -rw-r--r-- | robot/resources/sdngc_interface.robot | 6 | ||||
| -rw-r--r-- | robot/resources/so_interface.robot | 2 | ||||
| -rw-r--r-- | robot/resources/vid/vid_interface.robot | 5 |
7 files changed, 15 insertions, 11 deletions
diff --git a/robot/assets/service_mappings.py b/robot/assets/service_mappings.py index 2cdc0d59..ff41fad3 100644 --- a/robot/assets/service_mappings.py +++ b/robot/assets/service_mappings.py @@ -33,6 +33,8 @@ GLOBAL_SERVICE_TEMPLATE_MAPPING = { "vCPE" : [{"isBase" : "true", "template" : "vcpe_preload.template", "name_pattern": "base_clearwater"}], "vFWSNK" : [{"isBase" : "true", "template" : "vfwsnk_preload.template", "name_pattern": "base_vfw"}], "vPKG" : [{"isBase" : "true", "template" : "vpkg_preload.template", "name_pattern": "base_vpkg"}], + "vFWCL" : [{"isBase" : "true", "template" : "vfwsnk_preload.template", "name_pattern": "base_vfw"}, + {"isBase" : "true", "template" : "vpkg_preload.template", "name_pattern": "base_vpkg"}], } ''' diff --git a/robot/assets/templates/asdc/feature_group.template b/robot/assets/templates/asdc/feature_group.template index 8404bafc..9b54663a 100644 --- a/robot/assets/templates/asdc/feature_group.template +++ b/robot/assets/templates/asdc/feature_group.template @@ -7,6 +7,5 @@ ], "addedEntitlementPoolsIds": [ "${entitlement_pool_id}" - ], - "manufacturerReferenceNumber" : "${manufacturer_reference_number}" -}
\ No newline at end of file + ] +} diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot index 382821e9..9dc3254e 100644 --- a/robot/resources/asdc_interface.robot +++ b/robot/resources/asdc_interface.robot @@ -68,7 +68,7 @@ Distribute Model From ASDC # on certify it gets a new id ${catalog_service_id}= Certify ASDC Catalog Service ${catalog_service_id} Approve ASDC Catalog Service ${catalog_service_id} - : FOR ${DIST_INDEX} IN RANGE 3 + : FOR ${DIST_INDEX} IN RANGE 2 \ Log Distribution Attempt ${DIST_INDEX} \ Distribute ASDC Catalog Service ${catalog_service_id} \ ${catalog_service_resp}= Get ASDC Catalog Service ${catalog_service_id} @@ -408,6 +408,8 @@ Check Catalog Service Distributed \ Log ${ELEMENT['omfComponentID']} \ Log ${ELEMENT['status']} \ ${SO_COMPLETE} Set Variable If (('${ELEMENT['status']}' == 'DISTRIBUTION_COMPLETE_OK')) or ('${SO_COMPLETE}'=='TRUE') TRUE + \ Exit For Loop If ('${SO_COMPLETE}'=='TRUE') + \ Exit For Loop If ('${ELEMENT['status']}' == 'DISTRIBUTION_COMPLETE_ERROR') Should Be True ( '${SO_COMPLETE}'=='TRUE') SO Test Get Catalog Service Distribution Details [Documentation] gets an asdc catalog Service distrbution details diff --git a/robot/resources/global_properties.robot b/robot/resources/global_properties.robot index e32b01e9..7d8db8e0 100644 --- a/robot/resources/global_properties.robot +++ b/robot/resources/global_properties.robot @@ -6,7 +6,7 @@ Documentation store all properties that can change or are used in multipl *** Variables *** ${GLOBAL_APPLICATION_ID} robot-ete -${GLOBAL_MSO_STATUS_PATH} /ecomp/mso/infra/orchestrationRequests/v5/ +${GLOBAL_MSO_STATUS_PATH} /onap/so/infra/orchestrationRequests/v6/ ${GLOBAL_SELENIUM_BROWSER} chrome ${GLOBAL_SELENIUM_BROWSER_CAPABILITIES} Create Dictionary ${GLOBAL_SELENIUM_DELAY} 0 diff --git a/robot/resources/sdngc_interface.robot b/robot/resources/sdngc_interface.robot index 57198dbe..b311e9bd 100644 --- a/robot/resources/sdngc_interface.robot +++ b/robot/resources/sdngc_interface.robot @@ -117,7 +117,7 @@ Preload One Vnf Topology [Arguments] ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_module_name} ${vf_module_type} ${service} ${filename} ${uuid} Return From Keyword If '${filename}' == '' ${data_template}= OperatingSystem.Get File ${PRELOAD_VNF_TOPOLOGY_OPERATION_BODY}/preload.template - ${parameters}= Get Template Parameters ${filename} ${uuid} + ${parameters}= Get Template Parameters ${generic_vnf_name} ${filename} ${uuid} Set To Dictionary ${parameters} generic_vnf_name=${generic_vnf_name} generic_vnf_type=${generic_vnf_type} service_type=${service_type_uuid} vf_module_name=${vf_module_name} vf_module_type=${vf_module_type} ${data}= Fill JSON Template ${data_template} ${parameters} ${put_resp}= Run SDNGC Post Request ${SDNGC_INDEX_PATH}${PRELOAD_VNF_TOPOLOGY_OPERATION_PATH} ${data} @@ -126,7 +126,7 @@ Preload One Vnf Topology Should Be Equal As Strings ${get_resp.status_code} 200 Get Template Parameters - [Arguments] ${template} ${uuid} + [Arguments] ${generic_vnf_name} ${template} ${uuid} ${rest} ${suite}= Split String From Right ${SUITE NAME} . 1 ${uuid}= Catenate ${uuid} ${hostid}= Get Substring ${uuid} -4 @@ -147,7 +147,7 @@ Get Template Parameters # update the value map with unique values. - Set To Dictionary ${valuemap} uuid=${uuid} hostid=${hostid} ecompnet=${ecompnet} + Set To Dictionary ${valuemap} uuid=${uuid} hostid=${hostid} ecompnet=${ecompnet} generic_vnf_name=${generic_vnf_name} # # Mash together the defaults dict with the test case dict to create the set of diff --git a/robot/resources/so_interface.robot b/robot/resources/so_interface.robot index 70faf3bf..1116281f 100644 --- a/robot/resources/so_interface.robot +++ b/robot/resources/so_interface.robot @@ -45,7 +45,7 @@ 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= /ecomp/mso/catalog/v2/serviceVnfs? ${param} + ${data_path}= Catenate SEPARATOR= /onap/so/catalog/v2/serviceVnfs? ${param} ${resp}= Run MSO Get Request ${data_path} Log ${resp.json()} # ${resp.json()['serviceVnfs'][0]['vfModules'][0]['vfModuleLabel'] should be 'base_vpkg' diff --git a/robot/resources/vid/vid_interface.robot b/robot/resources/vid/vid_interface.robot index ec017577..35522793 100644 --- a/robot/resources/vid/vid_interface.robot +++ b/robot/resources/vid/vid_interface.robot @@ -100,7 +100,7 @@ Parse Instance Id ${json}= To Json ${request_list[1]} ${request_id}= Catenate ${json['requestReferences']['instanceId']} [Return] ${request_id} - + Get Model UUID from VID [Documentation] Must use UI since rest call get redirect to portal and get DNS error ... Search all services and match on the invariantUUID @@ -108,7 +108,8 @@ Get Model UUID from VID Go To ${VID_ENDPOINT}${VID_ENV}/rest/models/services ${resp}= Get Text xpath=//body/pre ${json}= To Json ${resp} - :for ${dict} in @{json} + ${services}= Get From Dictionary ${json} services + :for ${dict} in @{services} \ ${uuid}= Get From DIctionary ${dict} uuid \ ${inv}= Get From DIctionary ${dict} invariantUUID \ Return From Keyword If "${invariantUUID}" == "${inv}" ${uuid} |