Renamed Test Cleanup to Suite Cleanup; fix teardown to work properly in test suites

[osm/tests.git] / robot-systest / testsuite / k8s_04-openldap_helm.robot

diff --git a/robot-systest/testsuite/k8s_04-openldap_helm.robot b/robot-systest/testsuite/k8s_04-openldap_helm.robot
index 8df02f7..3f1a247 100644 (file)
--- a/robot-systest/testsuite/k8s_04-openldap_helm.robot
+++ b/robot-systest/testsuite/k8s_04-openldap_helm.robot
@@ -25,7 +25,7 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/k8scluster_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/k8s_04-openldap_helm_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -43,7 +43,7 @@ Create Package For OpenLDAP NS
     Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 Add K8s Cluster To OSM
-    [Tags]   openldap k8scluster   sanity   regression
+    [Tags]   openldap   sanity   regression
     Create K8s Cluster  %{K8S_CREDENTIALS}  ${k8scluster_version}  %{VIM_TARGET}  %{VIM_MGMT_NET}  ${k8scluster_name}
 
 Create Network Service Instance
@@ -56,7 +56,7 @@ Delete Network Service Instance
     Delete NS   ${ns_name}
 
 Remove K8s Cluster from OSM
-    [Tags]   openldap k8scluster   sanity   regression
+    [Tags]   openldap   sanity   regression
     Delete K8s Cluster  ${k8scluster_name}
 
 Delete NS Descriptor Test
@@ -69,9 +69,9 @@ Delete VNF Descriptor Test
 
 
 *** Keywords ***
-Test Cleanup
+Suite Cleanup
     [Documentation]  Test Suit Cleanup: Deleting Descriptor, instance and vim
-    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 K8s Cluster   ${k8scluster_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 K8s Cluster   ${k8scluster_name}