From 376b553086548430c07db1f8609d2c1c0abd18c4 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Tue, 19 Sep 2023 16:10:57 +0200 Subject: [PATCH] patch : addons: vxlan: fix VNI filter on single VXLAN device Requested by a customer using setup with single vxlan devices. Signed-off-by: Thomas Lamprecht --- debian/patches/series | 1 + .../upstream/0001-vxlan-fix-vni-filter.patch | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 debian/patches/upstream/0001-vxlan-fix-vni-filter.patch diff --git a/debian/patches/series b/debian/patches/series index d5772c9..7ae3f0a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ 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 upstream/0001-scheduler-avoid-waiting-for-stdout-eof-of-etc-networ.patch +upstream/0001-vxlan-fix-vni-filter.patch 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 +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 +--- + 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):