X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fepa_02-additional_capabilities.robot;h=6a108b3dbccb941cbcf2db7368e921ca3cc0e313;hb=3fd34dd479042990bd6a8b50be9a95b07ed9d587;hp=98d686cc7944a255aea9dc0d75a15e88eaf572fe;hpb=d225e550e79fdbb9f667975102b17232eca893c1;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 98d686c..6a108b3 100644
--- a/robot-systest/testsuite/epa_02-additional_capabilities.robot
+++ b/robot-systest/testsuite/epa_02-additional_capabilities.robot
@@ -24,41 +24,50 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/epa_02-additional_capabilities_data.py
+Force Tags   epa_02   cluster_epa   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   epa_quota_vnf
+${vnfd_name}   epa_quota-vnf
+${nsd_pkg}   epa_quota_ns
+${nsd_name}   epa_quota-ns
+
+# NS instance name and configuration
+${ns_name}   epa_02-epa_quota_test
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
+# SSH public keys file
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+
 ${ns_id}   ${EMPTY}
 ${vnf_server_id}   ${EMPTY}
 ${flavor_properties}   ${EMPTY}
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${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 +76,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 +84,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,19 +94,19 @@ 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}