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 ***
*** 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}
+
+