Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_08-disable_port_security_network_level_data.py
-Suite Teardown Run Keyword And Ignore Error Test Cleanup
+Suite Teardown Run Keyword And Ignore Error Suite Cleanup
*** Variables ***
Check Port Security Is Disabled
[Tags] disable_port_security sanity regression
- ${rc} ${disabled_ports}= Run and Return RC and Output osm ns-show ${ns_name} | grep -c '${port_disabled_msg}'
- Run Keyword Unless ${disabled_ports} > 6 Fail msg=Found only '${disabled_ports}' matches for '${port_disabled_msg}'
+ ${rc} ${disabled_ports}= Run and Return RC and Output osm ns-show ${ns_name} --literal | grep -c '${port_disabled_msg}'
+ Run Keyword Unless ${disabled_ports} > 0 Fail msg=Found '${disabled_ports}' matches for '${port_disabled_msg}'
Delete NS Instance
*** 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 VIM Target ${vim_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 VIM Target ${vim_name}