From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0B7299B349 for ; Mon, 20 Nov 2023 13:57:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DCA9019853 for ; Mon, 20 Nov 2023 13:57:40 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 20 Nov 2023 13:57:40 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id BFE7980FA; Mon, 20 Nov 2023 13:57:33 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id A3468181351; Mon, 20 Nov 2023 13:57:33 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 20 Nov 2023 13:57:27 +0100 Message-Id: <20231120125727.4134862-2-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231120125727.4134862-1-aderumier@odiso.com> References: <20231120125727.4134862-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.032 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH ifupdown2 1/1] Fix vxlan addon trying to remove fbd entries on reload with evpn X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Nov 2023 12:57:41 -0000 Signed-off-by: Alexandre Derumier --- debian/patches/series | 1 + ...-compare-between-remote-ips-and-old_.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 debian/patches/upstream/0001-addons-vxlan-fix-compare-between-remote-ips-and-old_.patch diff --git a/debian/patches/series b/debian/patches/series index 1ff8dd4..8522b9b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ pve/0009-gvgeb-fix-python-interpreter-shebang.patch upstream/0001-add-ipv6-slaac-support-inet6-auto-accept_ra.patch upstream/0001-addons-ethtool-add-rx-vlan-filter.patch upstream/0001-scheduler-import-traceback.patch +upstream/0001-addons-vxlan-fix-compare-between-remote-ips-and-old_.patch \ No newline at end of file diff --git a/debian/patches/upstream/0001-addons-vxlan-fix-compare-between-remote-ips-and-old_.patch b/debian/patches/upstream/0001-addons-vxlan-fix-compare-between-remote-ips-and-old_.patch new file mode 100644 index 0000000..0274279 --- /dev/null +++ b/debian/patches/upstream/0001-addons-vxlan-fix-compare-between-remote-ips-and-old_.patch @@ -0,0 +1,33 @@ +From 0a856df326649e78f5e790e01ddd843ab551e5ba Mon Sep 17 00:00:00 2001 +From: Alexandre Derumier +Date: Mon, 20 Nov 2023 12:55:11 +0100 +Subject: [PATCH] addons: vxlan: fix compare between remote-ips and + old_remote_ips + +fix regression from +https://github.com/CumulusNetworks/ifupdown2/commit/35a4278ffb588ddd9e610f9395853ff35923c069 + +remote-ips can be None (with evpn for example) but old_remote_ips is an empty list. +So the condition is always matching + +Signed-off-by: Alexandre Derumier +--- + ifupdown2/addons/vxlan.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ifupdown2/addons/vxlan.py b/ifupdown2/addons/vxlan.py +index 084aec9..e36d40c 100644 +--- a/ifupdown2/addons/vxlan.py ++++ b/ifupdown2/addons/vxlan.py +@@ -1244,7 +1244,7 @@ class vxlan(Vxlan, moduleBase): + # purge any removed remote ip + old_remoteips = self.get_old_remote_ips(ifaceobj.name) + +- if vxlan_purge_remotes or remoteips or (remoteips != old_remoteips): ++ if vxlan_purge_remotes or (isinstance(remoteips,list) and remoteips != old_remoteips): + # figure out the diff for remotes and do the bridge fdb updates + # only if provisioned by user and not by an vxlan external + # controller. +-- +2.39.2 + -- 2.39.2