From: Brian Freeman Date: Mon, 7 Oct 2019 19:14:50 +0000 (-0500) Subject: Fix teardown X-Git-Tag: 1.5.3^0 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F97010%2F2;p=testsuite.git Fix teardown Issue-ID: INT-1315 Change-Id: I42c5501f661815389948b1a4e5db61d63884b584 Signed-off-by: Brian Freeman (cherry picked from commit 53bf8d65899a09bf6c126d60ba3009e5ebdac497) --- diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 5bc6e53c..4f0c2dc8 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -226,15 +226,15 @@ Delete VNF Teardown VNF [Documentation] Called at the end of a test case to tear down the VNF created by Orchestrate VNF [Arguments] ${customer_name} ${catalog_service_id} ${catalog_resource_ids} - Run Keyword If '${TEST STATUS}' == 'PASS' Teardown Models ${catalog_service_id} ${catalog_resource_ids} - Run Keyword If '${TEST STATUS}' == 'PASS' Clean A&AI Inventory ${customer_name} + Teardown Models ${catalog_service_id} ${catalog_resource_ids} + Clean A&AI Inventory ${customer_name} Close All Browsers - Log Teardown VNF implemented for successful tests only Teardown VVG Server [Documentation] Teardown the server created as a place to mount the Volume Group. [Arguments] ${server_id} Return From Keyword if '${server_id}' == '' + Return From Keyword if '${server_id}' == 'None' Delete Server auth ${server_id} Wait for Server To Be Deleted auth ${server_id} Log Teardown VVG Server Completed