From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ifupdown2] patch : addons: vxlan: fix VNI filter on single VXLAN device
Date: Tue, 19 Sep 2023 16:10:57 +0200 [thread overview]
Message-ID: <20230919141057.2190173-1-aderumier@odiso.com> (raw)
Requested by a customer using setup with single vxlan devices.
---
debian/patches/series | 3 ++-
.../upstream/0001-vxlan-fix-vni-filter.patch | 27 +++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/upstream/0001-vxlan-fix-vni-filter.patch
diff --git a/debian/patches/series b/debian/patches/series
index cff704f..7119554 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,5 @@ 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-fix-bond-mac.patch
\ No newline at end of file
+upstream/0001-fix-bond-mac.patch
+upstream/0001-vxlan-fix-vni-filter.patch
\ No newline at end of file
diff --git a/debian/patches/upstream/0001-vxlan-fix-vni-filter.patch b/debian/patches/upstream/0001-vxlan-fix-vni-filter.patch
new file mode 100644
index 0000000..3944dc6
--- /dev/null
+++ b/debian/patches/upstream/0001-vxlan-fix-vni-filter.patch
@@ -0,0 +1,27 @@
+From 1707ffa1ceef7f8f444bdb4ad3477700d99feffb Mon Sep 17 00:00:00 2001
+From: Vincent Bernat <vincent@bernat.ch>
+Date: Mon, 4 Sep 2023 18:36:51 +0200
+Subject: [PATCH] addons: vxlan: fix VNI filter on single VXLAN device
+
+In af8d5db22b10909ff06032f1a2acc2f745d1f65b, the transformation of
+`vnis` (list) to `vnisd` (dictionary) left a reference to `vnis` which
+is now undefined. We just remove the line as the conversion from range
+to ints is done earlier in the function.
+
+Signed-off-by: Vincent Bernat <vincent@bernat.ch>
+---
+ ifupdown2/addons/vxlan.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/ifupdown2/addons/vxlan.py b/ifupdown2/addons/vxlan.py
+index 084aec98..3bde50aa 100644
+--- a/ifupdown2/addons/vxlan.py
++++ b/ifupdown2/addons/vxlan.py
+@@ -1049,7 +1049,6 @@ def single_vxlan_device_vni_filter(self, ifaceobj, vxlan_mcast_grp):
+ self.logger.error("%s: %s (%s)" %(ifaceobj.name, vlan_vni_map, str(e)))
+ return
+
+- vnis_int = utils.ranges_to_ints(vnis)
+ self.iproute2.bridge_link_update_vni_filter(ifaceobj.name, vnisd)
+
+ def check_and_raise_svd_tvd_errors(self, ifaceobj):
--
2.39.2
next reply other threads:[~2023-09-19 14:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-19 14:10 Alexandre Derumier [this message]
2024-07-05 7:57 ` [pve-devel] applied: " 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=20230919141057.2190173-1-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.