X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsa_07-alarms_from_sa-related_vnfs.robot;h=94ed0f103734564a23fabadafbff06ad92be6dd8;hb=89aa93d5cffe4e85158ba58eb2c9d24fc611d1c3;hp=ff4e73e5c58a27810fa67a480e6797fb0db6b10b;hpb=9ee77ea1d888c7b361b6d72efe70e739ff1ad5cc;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..94ed0f1 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,22 @@ 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}
+    Delete Temporary Descriptor Folder  '%{PACKAGES_FOLDER}/${new_vnfd_pkg}'
+
+
+Delete Temporary Descriptor Folder
+    [Documentation]  Removes the temporary package folder created for the test
+    [Arguments]   ${folder_name}
+    ${rc}   ${stdout}=   Run and Return RC and Output   rm -rf '${folder_name}'
+    log   ${stdout}
+
+