Revert "Revert "Modified testsuites to remove resource files""

[osm/tests.git] / robot-systest / testsuite / epa_04-epa_underlay_sriov.robot

diff --git a/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot b/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
index f916735..f88c1c6 100644 (file)
--- a/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
+++ b/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
@@ -25,11 +25,24 @@ Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot\r
 Resource   %{ROBOT_DEVOPS_FOLDER}/lib/openstack_lib.robot\r
 \r
-Variables   %{ROBOT_DEVOPS_FOLDER}/resources/epa_04-epa_underlay_sriov.py\r
+Force Tags   epa_04   cluster_epa   daily   regression\r
 \r
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup\r
 \r
+\r
 *** Variables ***\r
+# NS and VNF descriptor package folder and ids\r
+${vnfd_pkg}   epa_1vm_sriov_vnf\r
+${vnfd_name}   epa_1vm_sriov-vnf\r
+${nsd_pkg}   epa_1vm_sriov_ns\r
+${nsd_name}   epa_1vm_sriov-ns\r
+${ns_name}   epa_04\r
+\r
+# Fixed IPs and subnet for datanet VL\r
+${datanet_subnet}   192.168.100.0/24\r
+${datanet_ip1}   192.168.100.11\r
+${datanet_ip2}   192.168.100.22\r
+\r
 ${vnf_member_index_1}   1\r
 ${vnf_member_index_2}   2\r
 ${username}   ubuntu\r
@@ -40,27 +53,23 @@ ${success_return_code}   0
 \r
 *** Test Cases ***\r
 Create VNF Descriptor\r
-    [Tags]   epa_underlay_sriov   sanity   regression\r
 \r
     Remove Environment Variable  OVERRIDES\r
     Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'\r
 \r
 \r
 Create NS Descriptor\r
-    [Tags]   epa_underlay_sriov   sanity   regression\r
 \r
     Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'\r
 \r
 \r
 Instantiate Network Service\r
-    [Tags]   epa_underlay_sriov   sanity   regression\r
 \r
-    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}\r
+    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${EMPTY}\r
     Set Suite Variable  ${ns_id}  ${id}\r
 \r
 \r
 Get Management Ip Addresses\r
-    [Tags]   epa_underlay_sriov   sanity   regression\r
 \r
     Variable Should Exist  ${ns_id}  msg=Network service instance is not available\r
     ${ip}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index_1}\r
@@ -73,7 +82,6 @@ Get Management Ip Addresses
 \r
 \r
 Ping from Vnf1 to Vnf2\r
-    [Tags]   epa_underlay_sriov   sanity   regression\r
 \r
     Variable Should Exist  ${ip_mgmt_1}  msg=IP address of the data VNF '${vnf_member_index_1}' is not available\r
     Variable Should Exist  ${privatekey}  msg=SSH private key not available\r
@@ -83,7 +91,6 @@ Ping from Vnf1 to Vnf2
 \r
 \r
 Ping from Vnf2 to Vnf1\r
-    [Tags]   epa_underlay_sriov   sanity   regression\r
 \r
     Variable Should Exist  ${ip_mgmt_2}  msg=IP address of the data VNF '${vnf_member_index_2}' is not available\r
     Variable Should Exist  ${privatekey}  msg=SSH private key not available\r
@@ -92,19 +99,19 @@ Ping from Vnf2 to Vnf1
 \r
 \r
 Delete NS Instance\r
-    [Tags]   epa_underlay_sriov   sanity   regression  cleanup\r
+    [Tags]   cleanup\r
 \r
     Delete NS  ${ns_name}\r
 \r
 \r
 Delete NS Descriptor\r
-    [Tags]   epa_underlay_sriov   sanity   regression  cleanup\r
+    [Tags]   cleanup\r
 \r
     Delete NSD  ${nsd_name}\r
 \r
 \r
 Delete VNF Descriptor\r
-    [Tags]   epa_underlay_sriov   sanity   regression  cleanup\r
+    [Tags]   cleanup\r
 \r
     Delete VNFD  ${vnfd_name}\r
 \r