From c5e3a41bbeedcc7486f43edfbc85b63a95865773 Mon Sep 17 00:00:00 2001 From: Arthur de Kerhor Date: Tue, 1 Jun 2021 11:42:20 +0200 Subject: fib: fix flags updates when adding routes with a udp encap path When adding a route via a udp encap instance, FIB_ENTRY_FLAG_IMPORT should not be set. In particular, fib_route_attached_cross_table should always return false for such paths. Modified test_udp_encap to leverage the bug that needed to be fixed. Type: fix Signed-off-by: Arthur de Kerhor Change-Id: Iaa9489e96d1cff09751f92c62caf7999d924fd7f --- test/test_udp.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/test_udp.py b/test/test_udp.py index 3281c0d9df6..df9a0af3b6c 100644 --- a/test/test_udp.py +++ b/test/test_udp.py @@ -141,11 +141,11 @@ class TestUdpEncap(VppTestCase): # Routes via each UDP encap object - all combinations of v4 and v6. # route_4o4 = VppIpRoute( - self, "1.1.0.1", 32, + self, "1.1.0.1", 24, [VppRoutePath("0.0.0.0", 0xFFFFFFFF, type=FibPathType.FIB_PATH_TYPE_UDP_ENCAP, - next_hop_id=udp_encap_0.id)]) + next_hop_id=udp_encap_0.id)], table_id=1) route_4o6 = VppIpRoute( self, "1.1.2.1", 32, [VppRoutePath("0.0.0.0", @@ -172,12 +172,12 @@ class TestUdpEncap(VppTestCase): # # 4o4 encap # - p_4o4 = (Ether(src=self.pg0.remote_mac, - dst=self.pg0.local_mac) / + p_4o4 = (Ether(src=self.pg1.remote_mac, + dst=self.pg1.local_mac) / IP(src="2.2.2.2", dst="1.1.0.1") / UDP(sport=1234, dport=1234) / Raw(b'\xa5' * 100)) - rx = self.send_and_expect(self.pg0, p_4o4*NUM_PKTS, self.pg0) + rx = self.send_and_expect(self.pg1, p_4o4*NUM_PKTS, self.pg0) for p in rx: self.validate_outer4(p, udp_encap_0) p = IP(p["UDP"].payload.load) -- cgit 1.2.3-korg