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 DECE5CE4A for ; Tue, 19 Sep 2023 16:11:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C16DFB9E5 for ; Tue, 19 Sep 2023 16:11:07 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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 ; Tue, 19 Sep 2023 16:11:05 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 870E980FE; Tue, 19 Sep 2023 16:10:58 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 78BA1361143; Tue, 19 Sep 2023 16:10:58 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Tue, 19 Sep 2023 16:10:57 +0200 Message-Id: <20230919141057.2190173-1-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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.249 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vxlan.py] Subject: [pve-devel] [PATCH ifupdown2] patch : addons: vxlan: fix VNI filter on single VXLAN device 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: Tue, 19 Sep 2023 14:11:07 -0000 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 +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): -- 2.39.2