X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_08-disable_port_security_network_level.robot;h=12c4931519c6ea93629cfb41d388f5d092a3140f;hb=4cf45d797499817b5f639bd6245c3f84e762de14;hp=644f1c9ae446dd6620aaa498c04ceeb4cd28a8fa;hpb=ad6e51f883d787c25e7717c9cb7761adada4e91f;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 644f1c9..12c4931 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
@@ -25,7 +25,9 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/basic_08-disable_port_security_network_level_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Force Tags   basic_08   cluster_main   daily   regression
+
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -34,66 +36,61 @@ ${port_disabled_msg}   port_security_enabled: false
 
 *** Test Cases ***
 Create VIM With Port Security Disabled
-    [Tags]  disable_port_security  sanity   regression
 
     ${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}
 
 Create VNF Descriptor
-    [Tags]   disable_port_security   sanity   regression
 
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create NS Descriptor
-    [Tags]   disable_port_security   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Network Service
-    [Tags]   disable_port_security   sanity   regression
 
     ${id}=  Create Network Service  ${nsd_name}  ${vim_name}  ${ns_name}  ${ns_config}  ${publickey}
     Set Suite Variable  ${ns_id}  ${id}
 
 
 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
-    [Tags]   disable_port_security   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   disable_port_security   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   disable_port_security   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${vnfd_name}
 
 
 Delete VIM
-    [Tags]  disable_port_security  sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VIM Target  ${vim_name}
 
 
 *** 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}