diff options
| author |   Brian Freeman <bf1936@att.com> | 2020-12-11 14:03:57 -0500 |
|---|---|---|
| committer | Brian Freeman <bf1936@att.com> | 2020-12-11 14:04:02 -0500 |
| commit | 4e737ebf42405c431aeba47b9381d5c85c33ad50 (patch) | |
| tree | 581080f79d7cc47cfe85d2d07001a572accdd3c5 /robot/resources/test_templates | |
| parent | 64c82051fae901cfd7f0cbd42061bbe38a18c3f4 (diff) | |
Fix undeploye/delete operational policy
do both policy undeploys before deletes so that undeploy has more time to process
remove heatbridge.robot include references to get rid of error message at startup
remove commented out referecnes to heatbridge (cleanup)
Issue-ID: INT-1803
Change-Id: I0cb071f487faf6ecababdc6d8a5c0e3aa79720b7
Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'robot/resources/test_templates')
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 4 | ||||
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot | 1 |
2 files changed, 0 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 e4b44270..9d33f7ab 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -15,7 +15,6 @@ Resource ../aai/create_complex.robot Resource ../aai/create_tenant.robot Resource ../aai/create_service.robot Resource ../openstack/neutron_interface.robot -Resource ../heatbridge.robot Library ONAPLibrary.Openstack @@ -76,9 +75,6 @@ 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 - ## 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} diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot index 63266aa5..1ab5852c 100644 --- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot @@ -15,7 +15,6 @@ Resource ../aai/create_complex.robot Resource ../aai/create_tenant.robot Resource ../aai/create_service.robot Resource ../openstack/neutron_interface.robot -Resource ../heatbridge.robot Resource ../global_properties.robot |