X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fepa_01-epa_sriov.robot;h=8afcb7765b8c052911242e6fe22423a9596fbea7;hb=f25782945b1e3db0a2442c572a5f8607bb42460e;hp=b4e11ca29e71715bb0a4ee2469f9403818acbbcf;hpb=764873c0a568e327847299bbd8d32ed3d41ff07b;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/epa_01-epa_sriov.robot b/robot-systest/testsuite/epa_01-epa_sriov.robot
index b4e11ca..8afcb77 100644
--- a/robot-systest/testsuite/epa_01-epa_sriov.robot
+++ b/robot-systest/testsuite/epa_01-epa_sriov.robot
@@ -23,42 +23,51 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/epa_01-epa_sriov_data.py
+Force Tags   epa_01   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}   hackfest_basic_sriov_vnf
+${vnfd_name}   hackfest_basic_sriov-vnf
+${nsd_pkg}   hackfest_basic_sriov_ns
+${nsd_name}   hackfest_basic_sriov-ns
+
+# NS instance name and configuration
+${ns_name}   epa_01-epa_sriov_test
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
 ${ns_id}   ${EMPTY}
+
+# SSH keys and username to be used
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+${privatekey}   %{HOME}/.ssh/id_rsa
 ${username}   ubuntu
 ${password}   osm4u
-${vnf_member_index}   1
+${vnf_member_index}   vnf
 ${vnf_ip_addr}   ${EMPTY}
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
 
 
 *** Test Cases ***
 Create VNF Descriptor
-    [Tags]   epa_sriov   sanity   regression
 
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create NS Descriptor
-    [Tags]   epa_sriov   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Network Service
-    [Tags]   epa_sriov   sanity   regression
 
     ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}
     Set Suite Variable  ${ns_id}  ${id}
 
 
 Get VNF IP Address
-    [Tags]   epa_sriov   sanity   regression
 
     ${ip_addr}=  Get Vnf Management Ip Address   ${ns_id}   ${vnf_member_index}
     log   ${ip_addr}
@@ -66,36 +75,35 @@ Get VNF IP Address
 
 
 Check SR-IOV Interface
-    [Tags]   epa_sriov   sanity   regression
 
     Sleep  30 seconds  Waiting for SSH daemon to be up
     Execute Remote Command Check Rc Return Output   ${vnf_ip_addr}   ${username}   ${password}   ${privatekey}   lspci | grep "Ethernet controller" | grep -v "Virtio"
 
 Delete NS Instance
-    [Tags]   epa_sriov   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   epa_sriov   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   epa_sriov   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}