diff options
Diffstat (limited to 'robot/resources/test_templates/vnf_orchestration_test_template.robot')
-rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 14bba6be..1d84426e 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -67,13 +67,14 @@ Orchestrate VNF Validate Service Instance ${service_instance_id} ${service} ${customer_name} ${vnflist}= Get From Dictionary ${GLOBAL_SERVICE_VNF_MAPPING} ${service} ${vnfmap}= Create Dictionary - # For vFWLC closed loop test generic-vnf-name (${vnf_name} will be used as the FWL hostname so we - # now need to make it be a valid hostname + # For vFWLC closed loop test generic-vnf-name (${vnf_name} will be used as the FWL hostname so we + # now need to make it be a valid hostname :for ${vnf} in @{vnflist} - \ ${shortuuid}= Catenate ${uuid} + \ ${shortuuid}= Catenate ${uuid} \ ${shortuuid}= Replace String ${shortuuid} - ${SPACE} - \ ${shortuuid}= Get Substring ${shortuuid} -8 + \ ${shortuuid}= Get Substring ${shortuuid} -8 \ ${vnf_name}= Catenate ${vnf}${shortuuid} + \ ${vnf_name}= Convert To Lowercase ${vnf_name} \ ${vf_module_name}= Catenate Vfmodule_Ete_${vnf}_${uuid} \ ${vnf_type}= Get VNF Type ${catalog_resources} ${vnf} \ ${vf_module}= Get VF Module ${catalog_resources} ${vnf} @@ -114,9 +115,21 @@ Get Catalog Resource :for ${key} in @{keys} \ ${cr}= Get From Dictionary ${resources} ${key} - \ Return From Keyword If '${base_name}' in '${cr['allArtifacts']['heat1']['artifactDisplayName']}' ${cr} + \ ${status} ${value}= Run Keyword and Ignore Error Get Catalog Resource Info from Heat Artifact ${cr['allArtifacts']} ${base_name} + \ Return From Keyword If '${status}' == 'PASS' ${cr} Fail Unable to find catalog resource for ${vnf} ${base_name} +Get Catalog Resource Info from Heat Artifact + [Documentation] Need to look though the list of heats.... heat1, heat2... + [Arguments] ${artifacts} ${base_name} + ${keys}= Get Dictionary Keys ${artifacts} + ${heatArtifacts}= Create List + :for ${key} in @{keys} + \ Run Keyword If 'heat' in '${key}' and 'env' not in '${key}' Append To List ${heatArtifacts} ${artifacts['${key}']} + :for ${ha} in @{heatArtifacts} + \ Return From Keyword If '${base_name}' in '${ha['artifactDisplayName']}' + Fail Unable to find ${base_name} in heatArtifacts + Get Name Pattern [Documentation] To support services with multiple VNFs, we need to dig the vnf type out of the SDC catalog resources to select in the VID UI [Arguments] ${vnf} |