X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fepa_02-additional_capabilities.robot;h=a719a2b0dd1ff382f1fed6c959e0ac83b9fd63c5;hb=61bbf92c1b2a4563f1636f053a4846b669161714;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..a719a2b 100644
--- a/robot-systest/testsuite/epa_02-additional_capabilities.robot
+++ b/robot-systest/testsuite/epa_02-additional_capabilities.robot
@@ -11,7 +11,7 @@
 #   limitations under the License.
 
 *** Settings ***
-Documentation     [EPA-02] Support for additional EPA capabilities.
+Documentation   [EPA-02] Support for additional EPA capabilities.
 
 Library   OperatingSystem
 Library   String
@@ -24,59 +24,66 @@ 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   Test Cleanup
+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
 
-    Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+    Remove Environment Variable   OVERRIDES
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create NS Descriptor
-    [Tags]   epa_capabilities   sanity   regression
 
-    Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
+    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}
+    ${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]
+    ${vnfs_list}=   Get Ns Vnf List   ${ns_id}
+    ${vim_id}=   Get VNF VIM ID   ${vnfs_list}[0]
     log   ${vim_id}
     Set Suite Variable   ${vnf_server_id}   ${vim_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}
+    ${flavor_id}=   Get Server Flavor ID   ${vnf_server_id}
+    ${properties}=   Get Flavor Properties   ${flavor_id}
     log   ${properties}
     Set Suite Variable   ${flavor_properties}   ${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 +94,30 @@ Check Flavor Quota Properties
 
 
 Delete NS Instance
-    [Tags]   epa_capabilities   sanity   regression  cleanup
+    [Tags]   cleanup
 
-    Delete NS  ${ns_name}
+    Delete NS   ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   epa_capabilities   sanity   regression  cleanup
+    [Tags]   cleanup
 
-    Delete NSD  ${nsd_name}
+    Delete NSD   ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   epa_capabilities   sanity   regression  cleanup
+    [Tags]   cleanup
 
-    Delete VNFD  ${vnfd_name}
+    Delete VNFD   ${vnfd_name}
 
 
 *** Keywords ***
-Test Cleanup
-    [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
+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}