From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ifupdown2 1/1] Fix vxlan addon trying to remove fbd entries on reload with evpn
Date: Mon, 20 Nov 2023 13:57:27 +0100 [thread overview]
Message-ID: <20231120125727.4134862-2-aderumier@odiso.com> (raw)
In-Reply-To: <20231120125727.4134862-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
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 <aderumier@odiso.com>
+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 <aderumier@odiso.com>
+---
+ 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
next prev parent reply other threads:[~2023-11-20 12:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-20 12:57 [pve-devel] [PATCH ifupdown2 0/1] evpn vxlan reload bugfix Alexandre Derumier
2023-11-20 12:57 ` Alexandre Derumier [this message]
2023-11-20 13:41 ` [pve-devel] applied: [PATCH ifupdown2 1/1] Fix vxlan addon trying to remove fbd entries on reload with evpn Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231120125727.4134862-2-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox