X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fsa_08-vnf_with_vnf_indicators_snmp.robot;h=7cb6f6af934d608bf9ba8265b25bf16c345e3956;hb=686ed53c7a0309b96adf3f15ea81b8ddbb5c2171;hp=9409a9aa16beb8ddd57548b26a86afd781d3cc1c;hpb=f8bb63e5c31ba6f4cb1cddee89ce214521ca5f45;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot b/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot
index 9409a9a..7cb6f6a 100644
--- a/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot
+++ b/robot-systest/testsuite/sa_08-vnf_with_vnf_indicators_snmp.robot
@@ -25,7 +25,9 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/prometheus_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/sa_08-vnf_with_vnf_indicators_snmp_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Force Tags   sa_08   cluster_k8s   daily   regression
+
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -34,26 +36,22 @@ ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 
 *** Test Cases ***
 Create VNF Descriptor
-    [Tags]   vnf_indicators_snmp   sanity   regression
 
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create NS Descriptor
-    [Tags]   vnf_indicators_snmp   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Network Service
-    [Tags]   vnf_indicators_snmp   sanity   regression
 
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${EMPTY}
     Set Suite Variable  ${ns_id}  ${id}
 
 
 Get VNF SNMP Metrics
-    [Tags]   vnf_indicators_snmp   sanity   regression
 
     Variable Should Exist  ${prometheus_host}  msg=Prometheus address is not available
     Variable Should Exist  ${prometheus_port}  msg=Prometheus port is not available
@@ -66,27 +64,27 @@ Get VNF SNMP Metrics
 
 
 Delete NS Instance
-    [Tags]   vnf_indicators_snmp   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   vnf_indicators_snmp   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   vnf_indicators_snmp   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${vnfd_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 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}