X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_06-vnf_with_charm.robot;fp=robot-systest%2Ftestsuite%2Fbasic_06-vnf_with_charm.robot;h=ae957916a54b8f47a5dca201f1947130def3732c;hb=d225e550e79fdbb9f667975102b17232eca893c1;hp=b0929600795c2c7a2b547c583395a75661a09294;hpb=15589053373c07bea08a52a6fc8dbcd6d80603ac;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_06-vnf_with_charm.robot b/robot-systest/testsuite/basic_06-vnf_with_charm.robot
index b092960..ae95791 100644
--- a/robot-systest/testsuite/basic_06-vnf_with_charm.robot
+++ b/robot-systest/testsuite/basic_06-vnf_with_charm.robot
@@ -23,7 +23,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_06-vnf_with_charm_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -125,12 +125,12 @@ Delete 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 Any Tests Failed  Delete NS  ${ns_name}
 
-    Run Keyword If Test Failed  Delete NSD  ${nsd_name}
+    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
 
-    Run Keyword If Test Failed  Delete VNFD  ${vnfd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}