Revert "Changes in VPNService CSIT Scripts"

Revert the CSIT script changes done for
Neutron DHCP feature, as the feature patch
has been reverted here:
https://git.opendaylight.org/gerrit/59733

This reverts commit 458ab58866d904ebabac47445eabd9bd3d4c0c09.

Change-Id: Ie1a980ce1ef1159b4dfcbe76db76245885e98375
Signed-off-by: Vivekanandan Narasimhan <n.vivekanandan@ericsson.com>

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot b/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
index 2c65c4a700f2f34dc9bb489529c8eae263fcae08..24b323bfdeb1081c59edfe127242bd8e97dae1b2 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
+++ b/csit/suites/netvirt/Netvirt_Vpnservice/01_basic_vpnservice.robot
@@ -384,11 +384,9 @@ Verify GWMAC Flow Entry On Flow Table
     \    Should Contain    ${gwmac_table}    dl_dst=${macAdd} actions=goto_table:${L3_TABLE}
     #verify Miss entry
     Should Contain    ${gwmac_table}    actions=resubmit(,17)
-    #Verify ARP_CHECK_TABLE - 43
     #arp request and response
-    ${arpchk_table} =    Get Lines Containing String    ${flow_output}    table=${ARP_CHECK_TABLE}
-    Should Match Regexp    ${arpchk_table}    ${ARP_RESPONSE_REGEX}
-    ${match} =    Should Match Regexp    ${arpchk_table}    ${ARP_REQUEST_REGEX}
+    Should Match Regexp    ${gwmac_table}    ${ARP_RESPONSE_REGEX}
+    ${match} =    Should Match Regexp    ${gwmac_table}    ${ARP_REQUEST_REGEX}
     ${groupID} =    Split String    ${match}    separator=:
     Log    groupID
     Verify ARP REQUEST in groupTable    ${group_output}    ${groupID[1]}

diff --git a/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot b/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot
index 8edf191396d32052dc87ec6da426e563ce1c2c27..96e8609fadd66c1af169bab78e997d3315bb5974 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot
+++ b/csit/suites/netvirt/Netvirt_Vpnservice/03_basic_ipv6_vpnservice.robot
@@ -387,11 +387,9 @@ Verify GWMAC Flow Entry On Flow Table
     \    Should Contain    ${gwmac_table}    dl_dst=${macAdd} actions=goto_table:${L3_TABLE}
     #verify Miss entry
     Should Contain    ${gwmac_table}    actions=resubmit(,17)
-    #Verify ARP_CHECK_TABLE - 43
     #arp request and response
-    ${arpchk_table} =    Get Lines Containing String    ${flow_output}    table=${ARP_CHECK_TABLE}
-    Should Match Regexp    ${arpchk_table}    ${ARP_RESPONSE_REGEX}
-    ${match} =    Should Match Regexp    ${arpchk_table}    ${ARP_REQUEST_REGEX}
+    Should Match Regexp    ${gwmac_table}    ${ARP_RESPONSE_REGEX}
+    ${match} =    Should Match Regexp    ${gwmac_table}    ${ARP_REQUEST_REGEX}
     ${groupID} =    Split String    ${match}    separator=:
     Log    groupID
     Should Contain    ${flow_output}    table=${IPV6_TABLE}

diff --git a/csit/variables/netvirt/Variables.robot b/csit/variables/netvirt/Variables.robot
index 189d1f96297ae189913ea080cccc8881fc09fcbe..c6364f86d3f9b4da28ae2d4b25289d37d8eb8fb3 100644 (file)
--- a/csit/variables/netvirt/Variables.robot
+++ b/csit/variables/netvirt/Variables.robot
@@ -31,9 +31,9 @@ ${RPING_EXP_STR}    broadcast
 # Values passed for extra routes
 ${RT_OPTIONS}     --route
 ${RT_CLEAR}       --no-route
-${ARP_RESPONSE_REGEX}    arp,arp_op=2 actions=CONTROLLER:65535,resubmit\\(,${ELAN_BASETABLE}\\)
+${ARP_RESPONSE_REGEX}    arp,arp_op=2 actions=CONTROLLER:65535,resubmit\\(,${DISPATCHER_TABLE}\\)
 ${ARP_REQUEST_REGEX}    arp,arp_op=1 actions=group:\\d+
-${ARP_REQUEST_GROUP_REGEX}    actions=CONTROLLER:65535,bucket=actions=resubmit\\(,${ELAN_BASETABLE}\\),bucket=actions=resubmit\\(,${ARP_RESPONSE_TABLE}\\)
+${ARP_REQUEST_GROUP_REGEX}    actions=CONTROLLER:65535,bucket=actions=resubmit\\(,${DISPATCHER_TABLE}\\),bucket=actions=resubmit\\(,${ARP_RESPONSE_TABLE}\\)
 # Values passed for BFD Tunnel monitoring
 ${TUNNEL_MONITOR_ON}    Tunnel Monitoring (for VXLAN tunnels): On
 ${TUNNEL_MONITOR_OFF}    Tunnel Monitoring (for VXLAN tunnels): Off
@@ -72,11 +72,9 @@ ${TUNNEL_INTERFACES}    ${CONFIG_API}/ietf-interfaces:interfaces/
 ${LEARNT_VIP}     ${OPERATIONAL_API}/odl-l3vpn:learnt-vpn-vip-to-port-data/
 ${DISPATCHER_TABLE}    17
 ${GWMAC_TABLE}    19
-${ARP_CHECK_TABLE}    43
 ${ARP_RESPONSE_TABLE}    81
 ${IPV6_TABLE}     45
 ${L3_TABLE}       21
-${ELAN_BASETABLE}    48
 ${ELAN_SMACTABLE}    50
 ${ELAN_DMACTABLE}    51
 ${ELAN_UNKNOWNMACTABLE}    52