X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fepa_02-additional_capabilities.robot;h=91b3500c021a57504b24ee6491df3539a00bfb4c;hb=686ed53c7a0309b96adf3f15ea81b8ddbb5c2171;hp=fd15e5f173d9765e71a79c8b75d3869551f71aa5;hpb=0e696254b8dfd0d2ba854f2c5f62523cbf9eba4c;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/epa_02-additional_capabilities.robot b/robot-systest/testsuite/epa_02-additional_capabilities.robot
index fd15e5f..91b3500 100644
--- a/robot-systest/testsuite/epa_02-additional_capabilities.robot
+++ b/robot-systest/testsuite/epa_02-additional_capabilities.robot
@@ -26,7 +26,9 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot
 
 Variables   %{ROBOT_DEVOPS_FOLDER}/resources/epa_02-additional_capabilities_data.py
 
-Suite Teardown   Run Keyword And Ignore Error   Test Cleanup
+Force Tags   epa_02   cluster_epa   daily   regression
+
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -39,26 +41,23 @@ ${success_return_code}   0
 
 *** Test Cases ***
 Create VNF Descriptor
-    [Tags]   epa_capabilities   sanity   regression
 
+    Remove Environment Variable  OVERRIDES
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create NS Descriptor
-    [Tags]   epa_capabilities   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Network Service
-    [Tags]   epa_capabilities   sanity   regression
 
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}
     Set Suite Variable  ${ns_id}  ${id}
 
 
 Get VNF Server ID
-    [Tags]   epa_capabilities   sanity   regression
 
     ${vnfs_list}=  Get Ns Vnf List   ${ns_id}
     ${vim_id}=  Get VNF VIM ID   ${vnfs_list}[0]
@@ -67,7 +66,6 @@ Get VNF Server ID
 
 
 Get Server Flavor Properties
-    [Tags]   epa_capabilities   sanity   regression
 
     ${flavor_id}=  Get Server Flavor ID   ${vnf_server_id}
     ${properties}=  Get Flavor Properties   ${flavor_id}
@@ -76,7 +74,6 @@ Get Server Flavor Properties
 
 
 Check Flavor Quota Properties
-    [Tags]   epa_capabilities   sanity   regression
 
     ${rc}=   Run and Return RC   echo ${flavor_properties} | grep "cpu_shares_level=custom"
     Should Be Equal As Integers   ${rc}   ${success_return_code}
@@ -87,30 +84,30 @@ Check Flavor Quota Properties
 
 
 Delete NS Instance
-    [Tags]   epa_capabilities   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   epa_capabilities   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   epa_capabilities   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 Any Tests Failed  Delete NS  ${ns_name}
 
-    Run Keyword If Test Failed  Delete NSD  ${nsd_name}
+    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
 
-    Run Keyword If Test Failed  Delete VNFD  ${vnfd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}