summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorBenoît Ganne <bganne@cisco.com>2019-06-05 19:08:40 +0200
committerNeale Ranns <nranns@cisco.com>2019-06-06 08:07:35 +0000
commit286921eef8aa07e9edd83078c0a8397d06dc448c (patch)
treefa310f46dc21b0be08814e3bab143f35b1e3238b /test
parentbe16beb9e47fe861fa77eb9a974abed1d6638009 (diff)
gbp: fix lpm classification with vlan
Fix GBP LPM packet classification in the presence of a VLAN header. Change-Id: I2ff63b34f7475d696b10b5a245ff802bbb1ff01a Signed-off-by: Benoît Ganne <bganne@cisco.com>
Diffstat (limited to 'test')
-rw-r--r--test/test_gbp.py33
1 files changed, 33 insertions, 0 deletions
diff --git a/test/test_gbp.py b/test/test_gbp.py
index e386a31e039..19ca81b9cfe 100644
--- a/test/test_gbp.py
+++ b/test/test_gbp.py
@@ -3529,6 +3529,9 @@ class TestGBP(VppTestCase):
vlan_101 = VppDot1QSubint(self, self.pg0, 101)
vlan_101.admin_up()
VppL2Vtr(self, vlan_101, L2_VTR_OP.L2_POP_1).add_vpp_config()
+ # vlan_102 is not poped
+ vlan_102 = VppDot1QSubint(self, self.pg0, 102)
+ vlan_102.admin_up()
ext_itf = VppGbpExtItf(self, self.loop0, bd1, rd1)
ext_itf.add_vpp_config()
@@ -3557,6 +3560,12 @@ class TestGBP(VppTestCase):
"2001:10::2", "3001::2",
ep_flags.GBP_API_ENDPOINT_FLAG_EXTERNAL)
eep2.add_vpp_config()
+ eep3 = VppGbpEndpoint(self, vlan_102,
+ epg_220, None,
+ "10.0.0.3", "11.0.0.3",
+ "2001:10::3", "3001::3",
+ ep_flags.GBP_API_ENDPOINT_FLAG_EXTERNAL)
+ eep3.add_vpp_config()
#
# A remote external endpoint
@@ -3582,6 +3591,16 @@ class TestGBP(VppTestCase):
rxs = self.send_and_expect(self.pg0, p_arp * 1, self.pg0)
#
+ # ARP packet from host in remote subnet are accepted and replied to
+ #
+ p_arp = (Ether(src=vlan_102.remote_mac, dst="ff:ff:ff:ff:ff:ff") /
+ Dot1Q(vlan=102) /
+ ARP(op="who-has",
+ psrc="10.0.0.17", pdst="10.0.0.128",
+ hwsrc=vlan_102.remote_mac, hwdst="ff:ff:ff:ff:ff:ff"))
+ rxs = self.send_and_expect(self.pg0, p_arp * 1, self.pg0)
+
+ #
# packets destined to unknown addresses in the BVI's subnet
# are ARP'd for
#
@@ -3662,6 +3681,20 @@ class TestGBP(VppTestCase):
self.assertEqual(rx[Dot1Q].vlan, 101)
#
+ # local EP pings router w/o vlan tag poped
+ #
+ p = (Ether(src=eep3.mac, dst=str(self.router_mac)) /
+ Dot1Q(vlan=102) /
+ IP(src=eep3.ip4.address, dst="10.0.0.128") /
+ ICMP(type='echo-request'))
+
+ rxs = self.send_and_expect(self.pg0, p * 1, self.pg0)
+
+ for rx in rxs:
+ self.assertEqual(rx[Ether].src, str(self.router_mac))
+ self.assertEqual(rx[Ether].dst, vlan_102.remote_mac)
+
+ #
# A subnet reachable through the external EP1
#
ip_220 = VppIpRoute(self, "10.220.0.0", 24,