diff options
Diffstat (limited to 'robot')
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 8 | ||||
| -rw-r--r-- | robot/resources/vid/teardown_vid.robot | 3 | ||||
| -rw-r--r-- | robot/testsuites/demo.robot | 10 |
3 files changed, 13 insertions, 8 deletions
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index ac5c9cd1..e4b44270 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -76,7 +76,10 @@ Orchestrate VNF \ ${generic_vnf}= Validate Generic VNF ${vnf_name} ${vnf_type} ${service_instance_id} \ Set To Dictionary ${generic_vnfs} ${vf_module_type} ${generic_vnf} # TODO: Need to look at a better way to default ipv4_oam_interface search for Heatbridge - \ ${uris_to_delete}= Execute Heatbridge ${vf_module_name} ${vnf} ${service} ipv4_oam_interface + ## Part of removale of heatbridge + ## \ ${uris_to_delete}= Execute Heatbridge ${vf_module_name} ${vnf} ${service} ipv4_oam_interface + ## set a fake urils_to_delete until we confirm heatbridge can be fully removed + \ ${uris_to_delete}= Set Variable 'http://devnull' \ Validate VF Module ${vf_module_name} ${vnf} \ Append To List ${vf_module_name_list} ${vf_module_name} [Return] ${vf_module_name_list} ${generic_vnfs} ${server_id} ${service_instance_id} ${catalog_resource_ids} ${catalog_service_id} ${uris_to_delete} @@ -125,7 +128,8 @@ Orchestrate Demo VNF \ ${generic_vnf}= Validate Generic VNF ${vnf_name} ${vnf_type} ${service_instance_id} \ Set To Dictionary ${generic_vnfs} ${vf_module_type} ${generic_vnf} # TODO: Need to look at a better way to default ipv4_oam_interface search for Heatbridge - \ Execute Heatbridge ${vf_module_name} ${vnf} ${service} ipv4_oam_interface + ## Part of remove Heatbridge + ##\ Execute Heatbridge ${vf_module_name} ${vnf} ${service} ipv4_oam_interface \ Validate VF Module ${vf_module_name} ${vnf} \ Append To List ${vf_module_name_list} ${vf_module_name} [Return] ${vf_module_name} ${service} ${generic_vnfs} diff --git a/robot/resources/vid/teardown_vid.robot b/robot/resources/vid/teardown_vid.robot index bf2af6f4..a2ffc83c 100644 --- a/robot/resources/vid/teardown_vid.robot +++ b/robot/resources/vid/teardown_vid.robot @@ -36,7 +36,8 @@ Delete VID Return From Keyword If '${status}' == 'FAIL' ${status} ${vfmodule} Return From Keyword If '${vfmodule}' == 'FAIL' ${status} ${vfmodule} # After tearing down a VF module, execute the reverse HB for it to remove the references from A&AI - Run Keyword If 'Vfmodule_Ete' in '${vfmodule}' Execute Reverse Heatbridge ${uris_to_delete} + ## Removed heatbridge + ## Run Keyword If 'Vfmodule_Ete' in '${vfmodule}' Execute Reverse Heatbridge ${uris_to_delete} Fail Continue with Next Remove Delete Next VID Entity diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot index 3812bb66..14fecfe0 100644 --- a/robot/testsuites/demo.robot +++ b/robot/testsuites/demo.robot @@ -119,11 +119,11 @@ Delete Instantiated VNF Delete VNF ${TENANT_NAME} ${VVG_SERVER_ID} ${CUSTOMER_NAME} ${SERVICE_INSTANCE_ID} ${STACK_NAMES} ${REVERSE_HEATBRIDGE} [Teardown] Teardown VNF ${CUSTOMER_NAME} ${CATALOG_SERVICE_ID} ${CATALOG_RESOURCE_IDS} -Run Heatbridge - [Documentation] - ... Try to run heatbridge - [Tags] heatbridge - Execute Heatbridge ${HB_STACK} ${HB_VNF} ${HB_SERVICE} ${HB_IPV4_OAM_ADDRESS} +#Run Heatbridge +# [Documentation] +# ... Try to run heatbridge +# [Tags] heatbridge +# Execute Heatbridge ${HB_STACK} ${HB_VNF} ${HB_SERVICE} ${HB_IPV4_OAM_ADDRESS} Preload APPC CDT GUI [Documentation] |