X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fepa_05-epa_underlay_passthrough.robot;h=d0ed8cab5bf51e363b3fc580f82befbbac35458a;hb=f25782945b1e3db0a2442c572a5f8607bb42460e;hp=ddd4f82d3354f6b6668dba2fa0627cbecb4ad993;hpb=b4697d33398409acad5640cf0f616fe8b8912e48;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
index ddd4f82..d0ed8ca 100644
--- a/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
+++ b/robot-systest/testsuite/epa_05-epa_underlay_passthrough.robot
@@ -25,8 +25,6 @@ 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
@@ -45,8 +43,8 @@ ${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
+${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}"}]} ] }
@@ -86,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}