diff options
author | Daniel Rose <dr695h@att.com> | 2017-12-09 21:40:29 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-12-09 21:40:29 +0000 |
commit | 7125f8c4b623c08fb9760212193dc449aa6ee589 (patch) | |
tree | e29fbef81b6f4caebc5c6434575b4652c8855f73 /robot/resources/test_templates | |
parent | 0de1c87eef1cddad0b59dea8fd2730a28cf8cdee (diff) | |
parent | 19345a71787aa318c05a4aa04c1abb014ad37704 (diff) |
Merge "Implement VFW policy update for demo.sh (trial)" into amsterdam
Diffstat (limited to 'robot/resources/test_templates')
-rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 049d4cc7..1d84426e 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -115,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} |