X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=inline;f=robot-systest%2Ftestsuite%2Fbasic_08-disable_port_security_network_level.robot;h=11effd9e0f3b20f1de3f3f881c139da8127fd301;hb=23ff8f980f66ef57fb4d254336a018e3a697a187;hp=80dd018412f26378a627ac63419d2f239239942c;hpb=f4ebaa88025189ede4f073ab8a1f27c95efff867;p=osm%2Ftests.git diff --git a/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot b/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot index 80dd018..11effd9 100644 --- a/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot +++ b/robot-systest/testsuite/basic_08-disable_port_security_network_level.robot @@ -27,6 +27,7 @@ Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_08-disable_port_security_netw Force Tags basic_08 cluster_main daily regression +Suite Setup Run Keyword And Ignore Error Suite Preparation Suite Teardown Run Keyword And Ignore Error Suite Cleanup @@ -38,7 +39,7 @@ ${port_disabled_msg} port_security_enabled: false Create VIM With Port Security Disabled ${created_vim_account_id}= Create VIM Target ${vim_name} ${vim_user} ${vim_password} ${vim_auth_url} ${vim_tenant} ${vim_account_type} config=${vim_config} - Check for VIM Target Status ${vim_name} ${prometheus_host} ${prometheus_port} + Check for VIM Target Status ${vim_name} ${prometheus_host} ${prometheus_port} ${prometheus_user} ${prometheus_password} Create VNF Descriptor @@ -59,7 +60,7 @@ Instantiate Network Service Check Port Security Is Disabled ${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}' + Run Keyword If ${disabled_ports} <= 0 Fail msg=Found '${disabled_ports}' matches for '${port_disabled_msg}' Delete NS Instance @@ -87,6 +88,12 @@ Delete VIM *** Keywords *** +Suite Preparation + [Documentation] Test Suite Preparation: Setting Prometheus Testsuite Variables + + Set Testsuite Prometheus Variables + + Suite Cleanup [Documentation] Test Suite Cleanup: Deleting descriptors and NS instance