From: Victor Pickard <vpickard@redhat.com>
Date: Tue, 27 Feb 2018 19:08:47 +0000 (-0500)
Subject: Fix L2GW test case 16
X-Git-Tag: pre-potassium~904
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=a08f81f84bed6960a402daf21b3349e5803b9ef5;p=integration%2Ftest.git

Fix L2GW test case 16

Should be 3 ports, not 1.

Fix a typo.

Check port_mac[2], which is the remote OVSPORT2 MAC,
instead of port_mac[4], which is the local HWVTEPPORT3
MAC.

Change-Id: I7673b7889181636f9ec296ccd00cbdddbdfce6f4
Signed-off-by: Victor Pickard <vpickard@redhat.com>
---

diff --git a/csit/libraries/L2GatewayOperations.robot b/csit/libraries/L2GatewayOperations.robot
index b2633f8863..d7199bd7b2 100644
--- a/csit/libraries/L2GatewayOperations.robot
+++ b/csit/libraries/L2GatewayOperations.robot
@@ -173,7 +173,7 @@ Verify Ping In Namespace Extra Timeout
     ${output}=    Exec Command    ${conn_id}    ${NETNS_EXEC} ${ns_name} ping -c3 ${vm_ip}    30s
     Log    ${output}
     Should Not Contain    ${output}    ${PACKET_LOSS}
-    Wait Until Keyword Succeeds    30s    2s    Verify Mcas Local Table While Ping    ${ns_port_mac}    ${conn_id}
+    Wait Until Keyword Succeeds    30s    2s    Verify Macs Local Table While Ping    ${ns_port_mac}    ${conn_id}
 
 Verify Ping Fails In Namespace
     [Arguments]    ${ns_name}    ${ns_port_mac}    ${vm_ip}    ${conn_id}=${hwvtep_conn_id}    ${hwvtep_ip}=${HWVTEP_IP}
@@ -182,7 +182,7 @@ Verify Ping Fails In Namespace
     Log    ${output}
     Should Contain    ${output}    ${PACKET_LOSS}
 
-Verify Mcas Local Table While Ping
+Verify Macs Local Table While Ping
     [Arguments]    ${mac}    ${conn_id}
     [Documentation]    Keyword to check if ${mac} is available under UCAST_MACS_LOCALE_TABLE of HWVTEP dump table.
     Verify Vtep List    ${conn_id}    ${UCAST_MACS_LOCALE_TABLE}    ${mac}
diff --git a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
index d9fc29b207..a5e5e07480 100644
--- a/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
+++ b/csit/suites/l2gw/01_Configure_verify_l2gateway.robot
@@ -171,11 +171,11 @@ TC16 Verify L2Gateway Connection
     Should Contain    ${output}    physicalswitch/${HWVTEP_BRIDGE}
     Wait Until Keyword Succeeds    30s    1s    L2GatewayOperations.Verify Vtep List    ${hwvtep_conn_id}    ${TUNNEL_TABLE}    enable="true"
     ${phy_port_out}=    Get Vtep List    ${PHYSICAL_PORT_TABLE}
-    Validate Regexp In String    ${phy_port_out}    ${VLAN_BINDING_REGEX}    1
+    Validate Regexp In String    ${phy_port_out}    ${VLAN_BINDING_REGEX}    3
     ${list}=    Create List    ${OVS_IP}    ${HWVTEP_IP}
     Wait Until Keyword Succeeds    30s    1s    L2GatewayOperations.Verify Vtep List    ${hwvtep_conn_id}    ${PHYSICAL_LOCATOR_TABLE}    @{list}
     Wait Until Keyword Succeeds    30s    1s    L2GatewayOperations.Verify Vtep List    ${hwvtep_conn_id}    ${UCAST_MACS_REMOTE_TABLE}    ${port_mac_list[0]}
-    Wait Until Keyword Succeeds    30s    1s    L2GatewayOperations.Verify Vtep List    ${hwvtep_conn_id}    ${UCAST_MACS_REMOTE_TABLE}    ${port_mac_list[4]}
+    Wait Until Keyword Succeeds    30s    1s    L2GatewayOperations.Verify Vtep List    ${hwvtep_conn_id}    ${UCAST_MACS_REMOTE_TABLE}    ${port_mac_list[2]}
 
 TC17 Dhcp Ip Allocation For Hwvtep Tap Port
     [Documentation]    Verify the 2nd HWVTEP port was able to get an IP address