Updated VNF member identifier

[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 3efeb03..d0ca379 100644 (file)
--- a/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
+++ b/robot-systest/testsuite/epa_04-epa_underlay_sriov.robot
@@ -25,16 +25,26 @@ 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
-\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
-${vnf_member_index_1}   1\r
-${vnf_member_index_2}   2\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}   vnf1\r
+${vnf_member_index_2}   vnf2\r
 ${username}   ubuntu\r
 ${password}   osm4u\r
 ${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}"}]} ] }\r
@@ -55,7 +65,7 @@ Create NS Descriptor
 \r
 Instantiate Network Service\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
@@ -74,17 +84,15 @@ Get Management Ip Addresses
 Ping from Vnf1 to Vnf2\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
     Sleep   30 seconds   Wait for SSH daemon to be up\r
-    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ip_mgmt_1}   ${username}   ${password}   ${privatekey}   ip addr ; ping -c 5 ${datanet_ip2}\r
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ip_mgmt_1}   ${username}   ${password}   ${EMPTY}   ip addr ; ping -c 5 ${datanet_ip2}\r
     log  ${stdout}\r
 \r
 \r
 Ping from Vnf2 to Vnf1\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
-    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ip_mgmt_2}   ${username}   ${password}   ${privatekey}   ip addr ; ping -c 5 ${datanet_ip1}\r
+    ${stdout}=   Execute Remote Command Check Rc Return Output   ${ip_mgmt_2}   ${username}   ${password}   ${EMPTY}   ip addr ; ping -c 5 ${datanet_ip1}\r
     log  ${stdout}\r
 \r
 \r