From ea8adf76375389e4c46c1a2eb903743142e44a8d Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Fri, 13 Aug 2021 08:10:59 +0000 Subject: ip-neighbor: Handle local MAC address change for incomplete adjacencies Type: fix When the local MAC address of an interface changes the rewrite strings of all adjacency types need to be updated - this patch fixes the missing case of incomplete adjacencies. I moved the update of all adj types into the adj module, since if the complete adjs were done by the ip-neighbour module and incomplete ones by adj module, that would mean two walks of the adj DB, as it is not possible to walk only a specific type. UT is updated to include the missing case. Signed-off-by: Neale Ranns Signed-off-by: Ivan Shvedunov Change-Id: I36af94976c645bdd0d4d3bc0093b24d7d077e9d7 --- test/test_neighbor.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'test/test_neighbor.py') diff --git a/test/test_neighbor.py b/test/test_neighbor.py index b33a70b2a3c..e893085cfdc 100644 --- a/test/test_neighbor.py +++ b/test/test_neighbor.py @@ -1372,7 +1372,7 @@ class ARPTestCase(VppTestCase): def test_arp_incomplete(self): """ ARP Incomplete""" - self.pg1.generate_remote_hosts(3) + self.pg1.generate_remote_hosts(4) p0 = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IP(src=self.pg0.remote_ip4, @@ -1384,6 +1384,11 @@ class ARPTestCase(VppTestCase): dst=self.pg1.remote_hosts[2].ip4) / UDP(sport=1234, dport=1234) / Raw()) + p2 = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / + IP(src=self.pg0.remote_ip4, + dst="1.1.1.1") / + UDP(sport=1234, dport=1234) / + Raw()) # # a packet to an unresolved destination generates an ARP request @@ -1404,6 +1409,18 @@ class ARPTestCase(VppTestCase): is_static=1) static_arp.add_vpp_config() + # + # add a route through remote host 3 hence we get an incomplete + # + VppIpRoute(self, "1.1.1.1", 32, + [VppRoutePath(self.pg1.remote_hosts[3].ip4, + self.pg1.sw_if_index)]).add_vpp_config() + rx = self.send_and_expect(self.pg0, [p2], self.pg1) + self.verify_arp_req(rx[0], + self.pg1.local_mac, + self.pg1.local_ip4, + self.pg1._remote_hosts[3].ip4) + # # change the interface's MAC # @@ -1418,6 +1435,11 @@ class ARPTestCase(VppTestCase): "00:00:00:33:33:33", self.pg1.local_ip4, self.pg1._remote_hosts[2].ip4) + rx = self.send_and_expect(self.pg0, [p2], self.pg1) + self.verify_arp_req(rx[0], + "00:00:00:33:33:33", + self.pg1.local_ip4, + self.pg1._remote_hosts[3].ip4) # # packets to the resolved host also have the new source mac -- cgit 1.2.3-korg