Removed unused 'privatekey' variable in EPA04 and EPA05 tests

[osm/tests.git] / robot-systest / testsuite / epa_05-epa_underlay_passthrough.robot

diff --git a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
index 7f0f5c4..6ea9e8c 100644 (file)
--- a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
+++ b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
@@ -25,14 +25,24 @@ 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_05-epa_underlay_passthrough.py
-
 Force Tags   epa_05   cluster_epa
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   epa_1vm_passthrough_vnf
+${vnfd_name}   epa_1vm_passthrough-vnf
+${nsd_pkg}   epa_1vm_passthrough_ns
+${nsd_name}   epa_1vm_passthrough-ns
+${ns_name}   epa_05
+
+# Fixed IPs and subnet for datanet VL
+${datanet_subnet}   192.168.110.0/24
+${datanet_ip1}   192.168.110.11
+${datanet_ip2}   192.168.110.22
+
 ${vnf_member_index_1}   1
 ${vnf_member_index_2}   2
 ${username}   ubuntu
@@ -55,7 +65,7 @@ Create NS Descriptor
 
 Instantiate Network Service
 
-    ${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}
 
 
@@ -74,17 +84,15 @@ Get Management Ip Addresses
 Ping from Vnf1 to Vnf2
 
     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
 
     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}