X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fepa_04-epa_underlay_sriov.robot;h=d0ca379b42ff29f5aa356dd446a3f5a43ca896be;hb=f25782945b1e3db0a2442c572a5f8607bb42460e;hp=f91673559254f2a8e9fedae0ddefa80fbac79917;hpb=5ea4054ac0a4327feb3c6cf4ba14b222b10b391c;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot b/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
index f916735..d0ca379 100644
--- a/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
+++ b/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
@@ -25,13 +25,26 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot
 
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/epa_04-epa_underlay_sriov.py
+Force Tags   epa_04   cluster_epa   daily   regression
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
+
 *** Variables ***
-${vnf_member_index_1}   1
-${vnf_member_index_2}   2
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   epa_1vm_sriov_vnf
+${vnfd_name}   epa_1vm_sriov-vnf
+${nsd_pkg}   epa_1vm_sriov_ns
+${nsd_name}   epa_1vm_sriov-ns
+${ns_name}   epa_04
+
+# Fixed IPs and subnet for datanet VL
+${datanet_subnet}   192.168.100.0/24
+${datanet_ip1}   192.168.100.11
+${datanet_ip2}   192.168.100.22
+
+${vnf_member_index_1}   vnf1
+${vnf_member_index_2}   vnf2
 ${username}   ubuntu
 ${password}   osm4u
 ${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} , {name: datanet, ip-profile: {ip-version: ipv4, subnet-address: "${datanet_subnet}"}, vnfd-connection-point-ref: [ {member-vnf-index-ref: "1", vnfd-connection-point-ref: vnf-data-ext, ip-address: "${datanet_ip1}"}, {member-vnf-index-ref: "2", vnfd-connection-point-ref: vnf-data-ext, ip-address: "${datanet_ip2}"}]} ] }
@@ -40,27 +53,23 @@ ${success_return_code}   0
 
 *** Test Cases ***
 Create VNF Descriptor
-    [Tags]   epa_underlay_sriov   sanity   regression
 
     Remove Environment Variable  OVERRIDES
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
 
 
 Create NS Descriptor
-    [Tags]   epa_underlay_sriov   sanity   regression
 
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
 
 
 Instantiate Network Service
-    [Tags]   epa_underlay_sriov   sanity   regression
 
-    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}
+    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${EMPTY}
     Set Suite Variable  ${ns_id}  ${id}
 
 
 Get Management Ip Addresses
-    [Tags]   epa_underlay_sriov   sanity   regression
 
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available
     ${ip}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index_1}
@@ -73,38 +82,34 @@ Get Management Ip Addresses
 
 
 Ping from Vnf1 to Vnf2
-    [Tags]   epa_underlay_sriov   sanity   regression
 
     Variable Should Exist  ${ip_mgmt_1}  msg=IP address of the data VNF '${vnf_member_index_1}' is not available
-    Variable Should Exist  ${privatekey}  msg=SSH private key not available
     Sleep   30 seconds   Wait for SSH daemon to be up
-    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ip_mgmt_1}   ${username}   ${password}   ${privatekey}   ip addr ; ping -c 5 ${datanet_ip2}
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ip_mgmt_1}   ${username}   ${password}   ${EMPTY}   ip addr ; ping -c 5 ${datanet_ip2}
     log  ${stdout}
 
 
 Ping from Vnf2 to Vnf1
-    [Tags]   epa_underlay_sriov   sanity   regression
 
     Variable Should Exist  ${ip_mgmt_2}  msg=IP address of the data VNF '${vnf_member_index_2}' is not available
-    Variable Should Exist  ${privatekey}  msg=SSH private key not available
-    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ip_mgmt_2}   ${username}   ${password}   ${privatekey}   ip addr ; ping -c 5 ${datanet_ip1}
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ip_mgmt_2}   ${username}   ${password}   ${EMPTY}   ip addr ; ping -c 5 ${datanet_ip1}
     log  ${stdout}
 
 
 Delete NS Instance
-    [Tags]   epa_underlay_sriov   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NS  ${ns_name}
 
 
 Delete NS Descriptor
-    [Tags]   epa_underlay_sriov   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete NSD  ${nsd_name}
 
 
 Delete VNF Descriptor
-    [Tags]   epa_underlay_sriov   sanity   regression  cleanup
+    [Tags]   cleanup
 
     Delete VNFD  ${vnfd_name}