Move l2gw to use Get VM IPs

Change-Id: Ic182f770e5a499b5dcaedacdd03448464e9fc0da
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/csit/libraries/L2GatewayOperations.robot b/csit/libraries/L2GatewayOperations.robot
index 4af6d06362013d6609742f0129b809104a68e558..245912de6b7466d641de284515a1c5d85beb780c 100644 (file)
--- a/csit/libraries/L2GatewayOperations.robot
+++ b/csit/libraries/L2GatewayOperations.robot
@@ -166,11 +166,11 @@ Verify Mcas Local Table While Ping
 
 Verify Nova VM IP
     [Arguments]    ${vm_name}
-    [Documentation]    Keyword to verify if the VM has received IP, and to vefiry it is not null.
-    ${vm_ip}    ${dhcp_ip}    Collect VM IP Addresses    false    ${vm_name}
-    Log    ${vm_ip}
+    [Documentation]    Keyword to verify if the VM has received IP, and to verify it is not null.
+    @{vm_ip}    ${dhcp_ip} =    Get VM IPs    ${vm_name}
     Should Not Contain    ${vm_ip}    None
-    [Return]    ${vm_ip}
+    Should Not Contain    ${dhcp_ip}    None
+    [Return]    @{vm_ip}[0]
 
 Get L2gw Debug Info
     [Documentation]    Keyword to collect the general debug information required for HWVTEP Test Suite.

diff --git a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
index b8d5b01e9bc89acd6d0c037b3689025f76d1f640..996d4606db13a040ed70884e239add419ad92d43 100644 (file)
--- a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
+++ b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
@@ -38,7 +38,7 @@ TC04 Create Vms On Compute Node
     OpenStackOperations.Create Vm Instance With Port On Compute Node    ${OVS_PORT_1}    ${OVS_VM1_NAME}    ${OVS_IP}
     ${vm_ip}=    Wait Until Keyword Succeeds    60s    2s    L2GatewayOperations.Verify Nova VM IP    ${OVS_VM1_NAME}
     Log    ${vm_ip}
-    Should Contain    ${vm_ip[0]}    ${port_ip_list[0]}
+    Should Contain    ${vm_ip}    ${port_ip_list[0]}
 
 TC05 Create L2Gateway And Connection And Verify
     ${output}=    L2GatewayOperations.Create Verify L2Gateway    ${HWVTEP_BRIDGE}    ${NS_PORT1}    ${L2GW_NAME1}
@@ -95,7 +95,7 @@ TC10 Update And Attach Second Port To Hwvtep Create L2gw Connection
     OpenStackOperations.Create Vm Instance With Port On Compute Node    ${OVS_PORT_2}    ${OVS_VM2_NAME}    ${OVS_IP}
     ${vm_ip}=    Wait Until Keyword Succeeds    60s    2s    L2GatewayOperations.Verify Nova VM IP    ${OVS_VM2_NAME}
     Log    ${vm_ip}
-    Should Contain    ${vm_ip[0]}    ${port_ip_list[2]}
+    Should Contain    ${vm_ip}    ${port_ip_list[2]}
     ${output}=    L2GatewayOperations.Create Verify L2Gateway    ${HWVTEP_BRIDGE}    ${NS_PORT2}    ${L2GW_NAME2}
     Log    ${output}
     ${output}=    L2GatewayOperations.Create Verify L2Gateway Connection    ${L2GW_NAME2}    ${NET_2}