Fixes tests QUOTAS-01, BASIC-08 and hackfest_cloudinit for SOL006

[osm/tests.git] / robot-systest / testsuite / slice_02-shared_network_slicing.robot

diff --git a/robot-systest/testsuite/slice_02-shared_network_slicing.robot b/robot-systest/testsuite/slice_02-shared_network_slicing.robot
index 14572c7..79010ad 100644 (file)
--- a/robot-systest/testsuite/slice_02-shared_network_slicing.robot
+++ b/robot-systest/testsuite/slice_02-shared_network_slicing.robot
@@ -29,7 +29,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/slice_02-shared_network_slicing_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -150,7 +150,7 @@ Test First Slice Connectivity
     Ping Many   ${mgmt_vnf_ip}  ${username}  ${password}  ${privatekey}   @{slice1_vnfs_ips}
 
 
-Stop Slice One Instance
+Delete Slice One Instance
     [Documentation]   Stops the slice instance (slice_name)
 
     [Tags]   shared_network_slicing   SLICING-02   sanity   regression   cleanup
@@ -188,7 +188,7 @@ Test Second Slice Connectivity
     Ping Many   ${mgmt_vnf_ip}  ${username}  ${password}  ${privatekey}   @{slice2_vnfs_ips}
 
 
-Stop Slice Two Instance
+Delete Slice Two Instance
     [Documentation]   Stops the slice instance (slice2_name)
 
     [Tags]   shared_network_slicing   SLICING-02   sanity   regression   cleanup
@@ -231,17 +231,20 @@ Delete VNF Descriptors
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting Descriptors, instance and templates
 
-    Run Keyword If Test Failed  Delete NST   ${nst_name}
-    Run Keyword If Test Failed  Delete NST   ${nst2_name}
+    Run Keyword If Any Tests Failed  Delete NSI   ${slice_name}
+    Run Keyword If Any Tests Failed  Delete NSI   ${slice2_name}
 
-    Run Keyword If Test Failed  Delete NSD   ${nsd1_name}
-    Run Keyword If Test Failed  Delete NSD   ${nsd2_name}
+    Run Keyword If Any Tests Failed  Delete NST   ${nst_name}
+    Run Keyword If Any Tests Failed  Delete NST   ${nst2_name}
 
-    Run Keyword If Test Failed  Delete VNFD   ${vnfd1_name}
-    Run Keyword If Test Failed  Delete VNFD   ${vnfd2_name}
+    Run Keyword If Any Tests Failed  Delete NSD   ${nsd1_name}
+    Run Keyword If Any Tests Failed  Delete NSD   ${nsd2_name}
+
+    Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd1_name}
+    Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd2_name}