Changes due to the refactor dhcp function patch

Change-Id: Ib87acd07b6670f95e8770feed3db10c99cd8feb7
Signed-off-by: abbas <abbas.pareedkunju@tcs.com>

diff --git a/csit/libraries/L2GatewayOperations.robot b/csit/libraries/L2GatewayOperations.robot
index 6116f377288d276e76e45fb6c2beed2e5f648064..ccfdaa3b564688dabc4ebb18df97350a9451122d 100644 (file)
--- a/csit/libraries/L2GatewayOperations.robot
+++ b/csit/libraries/L2GatewayOperations.robot
@@ -76,9 +76,9 @@ Delete L2Gateway
     [Arguments]    ${gw_name}
     [Documentation]    Keyword to delete the L2 Gateway ${gw_name} received in argument.
     ${output}=    Exec Command    ${devstack_conn_id}    ${L2GW_DELETE} ${gw_name}
+    Log    ${output}
     @{list_to_check}=    Create List    ${gw_name}
     Utils.Check For Elements Not At URI    ${L2GW_LIST_REST_URL}    ${list_to_check}    session
-    Log    ${output}
 
 Create Verify L2Gateway Connection
     [Arguments]    ${gw_name}    ${net_name}
@@ -173,7 +173,7 @@ 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}    Verify VMs Received DHCP Lease    ${vm_name}
+    ${vm_ip}    ${dhcp_ip}    Collect VM IP Addresses    false    ${vm_name}
     Log    ${vm_ip}
     Should Not Contain    ${vm_ip}    None
     [Return]    ${vm_ip}

diff --git a/csit/suites/l2gw/Configure_verify_l2gateway.robot b/csit/suites/l2gw/Configure_verify_l2gateway.robot
index 543b3fd54448d69b0bcae66a02fab14c02dfd5d9..5690a3651b0cb2494f6631eeb3917ff835bc0b9d 100644 (file)
--- a/csit/suites/l2gw/Configure_verify_l2gateway.robot
+++ b/csit/suites/l2gw/Configure_verify_l2gateway.robot
@@ -56,7 +56,7 @@ TC05 Create L2Gateway And Connection And Verify
     Wait Until Keyword Succeeds    30s    1s    L2GatewayOperations.Verify Vtep List    ${UCAST_MACS_REMOTE_TABLE}    ${port_mac_list[0]}
 
 TC06 Dhcp Ip Allocation For Hwvtep Tap Port
-    Wait Until Keyword Succeeds    30s    10s    L2GatewayOperations.Namespace Dhclient Verify    ${HWVTEP_NS1}    ${NS_TAP1}    ${port_ip_list[1]}
+    Wait Until Keyword Succeeds    180s    10s    L2GatewayOperations.Namespace Dhclient Verify    ${HWVTEP_NS1}    ${NS_TAP1}    ${port_ip_list[1]}
 
 TC07 Verify Ping From Compute Node Vm To Hwvtep
     ${output}=    Wait Until Keyword Succeeds    60s    10s    Execute Command on VM Instance    ${NET_1}    ${port_ip_list[0]}