X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsa_07-alarms_from_sa-related_vnfs.robot;h=9c62a407ef047a84edc09dab7e3086a5005bd57a;hb=d225e550e79fdbb9f667975102b17232eca893c1;hp=ff4e73e5c58a27810fa67a480e6797fb0db6b10b;hpb=15589053373c07bea08a52a6fc8dbcd6d80603ac;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot b/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
index ff4e73e..9c62a40 100644
--- a/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
+++ b/robot-systest/testsuite/sa_07-alarms_from_sa-related_vnfs.robot
@@ -26,7 +26,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/sa_07-alarms_from_sa-related_vnfs_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -153,12 +153,12 @@ Delete Webhook Service VNF Descriptor
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
 
-    Run Keyword If Test Failed  Delete NS  ${ns_name}
-    Run Keyword If Test Failed  Delete NSD  ${nsd_name}
-    Run Keyword If Test Failed  Delete VNFD  ${vnfd_name}
-    Run Keyword If Test Failed  Delete NS  ${ws_ns_name}
-    Run Keyword If Test Failed  Delete NSD  ${ws_nsd_name}
-    Run Keyword If Test Failed  Delete VNFD  ${ws_vnfd_name}
+    Run Keyword If Any Tests Failed  Delete NS  ${ns_name}
+    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}
+    Run Keyword If Any Tests Failed  Delete NS  ${ws_ns_name}
+    Run Keyword If Any Tests Failed  Delete NSD  ${ws_nsd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD  ${ws_vnfd_name}