summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Freeman <bf1936@att.com>2019-10-07 14:14:50 -0500
committerDaniel Rose <dr695h@att.com>2019-10-15 16:47:58 +0000
commitd55ea01ba9e661e5c1a70ab36c5d112c1f31d0c5 (patch)
treea248cad78ba17dd880b49029022fd9a35c671656
parente1bdee4d6635466fc0fa8bdbfb9d316f8b016352 (diff)
Fix teardown1.5.3
Issue-ID: INT-1315 Change-Id: I42c5501f661815389948b1a4e5db61d63884b584 Signed-off-by: Brian Freeman <bf1936@att.com> (cherry picked from commit 53bf8d65899a09bf6c126d60ba3009e5ebdac497)
-rw-r--r--robot/resources/test_templates/vnf_orchestration_test_template.robot6
1 files changed, 3 insertions, 3 deletions
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