X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fslice_01-network_slicing.robot;h=09c79294a998476b170955ae1bb08a0e0971d7f7;hb=refs%2Fchanges%2F01%2F10401%2F2;hp=2f531cb3a7ae509c3c9a0a26f82d7efbebe36a18;hpb=f96bb45c0a03f2188688d90d67ea718851cec2de;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/slice_01-network_slicing.robot b/robot-systest/testsuite/slice_01-network_slicing.robot
index 2f531cb..09c7929 100644
--- a/robot-systest/testsuite/slice_01-network_slicing.robot
+++ b/robot-systest/testsuite/slice_01-network_slicing.robot
@@ -30,7 +30,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/slice_01-network_slicing_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -137,7 +137,7 @@ Test Slice Connectivity
     Ping Many   ${mgmt_vnf_ip}  ${username}  ${password}  ${privatekey}   @{slice_vnfs_ips}
 
 
-Stop Slice Instance
+Delete Slice Instance
     [Documentation]   Stops the slice instance (slice_name)
 
     [Tags]   basic_network_slicing   SLICING-01   sanity   regression   cleanup
@@ -172,16 +172,18 @@ Delete VNF Descriptors
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting Descriptors, instance and template
 
-    Run Keyword If Test Failed  Delete NST   ${nst_name}
+    Run Keyword If Any Tests Failed  Delete NSI   ${slice_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 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}