From 928186191c79c4c3e6efa49d2d821896449ea074 Mon Sep 17 00:00:00 2001 From: Julien Fortin Date: Mon, 15 Aug 2022 18:33:05 +0200 Subject: [PATCH] nlcache: merge existing MTU into new netlink object (vlan/vxlan) before caching This patch fixes the gap in the vlan and vxlan code Signed-off-by: Julien Fortin --- ifupdown2/lib/nlcache.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ifupdown2/lib/nlcache.py b/ifupdown2/lib/nlcache.py index d94ad7a..32ff44e 100644 --- a/ifupdown2/lib/nlcache.py +++ b/ifupdown2/lib/nlcache.py @@ -2955,7 +2955,7 @@ class NetlinkListenerWithCache(nllistener.NetlinkManagerWithListener, BaseObject Link.IFLA_INFO_DATA: ifla_info_data }) link.build_message(next(self.sequence), self.pid) - return self.tx_nlpacket_get_response_with_error_and_cache_on_ack(link) + return self.tx_nlpacket_get_response_with_error_and_cache_on_ack(link, ifname) except Exception as e: if "Invalid argument" in str(e) and bridge_binding is not None: raise RetryCMD(cmd=" ".join(vlan_iproute2_cmd)) @@ -3052,7 +3052,7 @@ class NetlinkListenerWithCache(nllistener.NetlinkManagerWithListener, BaseObject Link.IFLA_INFO_DATA: info_data }) link.build_message(next(self.sequence), self.pid) - return self.tx_nlpacket_get_response_with_error_and_cache_on_ack(link) + return self.tx_nlpacket_get_response_with_error_and_cache_on_ack(link, ifname) def link_add_vxlan_with_info_data_dry_run(self, ifname, info_data): self.log_info_ifname_dry_run(