From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH ifupdown2 1/2] patch : vlan: fix vlan-protocol query check
Date: Thu, 20 Apr 2023 23:37:10 +0200 [thread overview]
Message-ID: <20230420213711.687478-2-aderumier@odiso.com> (raw)
In-Reply-To: <20230420213711.687478-1-aderumier@odiso.com>
upstream:
https://github.com/CumulusNetworks/ifupdown2/pull/258
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
debian/patches/series | 3 +-
...-check-vlan-protocol-for-not-dotted-.patch | 88 +++++++++++++++++++
2 files changed, 90 insertions(+), 1 deletion(-)
create mode 100644 debian/patches/upstream/0001-vlan-query_check-check-vlan-protocol-for-not-dotted-.patch
diff --git a/debian/patches/series b/debian/patches/series
index ccfd03d..a7c8da8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,4 +12,5 @@ pve/0011-d-rules-drop-now-default-with-systemd.patch
pve/0012-d-rules-add-dh_installsystemd-override-for-compat-12.patch
pve/0013-postinst-reload-network-config-on-first-install.patch
pve/0014-fix-pointopoint-regression.patch
-upstream/0001-ovs-add-support-for-fakebridge.patch
\ No newline at end of file
+upstream/0001-ovs-add-support-for-fakebridge.patch
+upstream/0001-vlan-query_check-check-vlan-protocol-for-not-dotted-.patch
\ No newline at end of file
diff --git a/debian/patches/upstream/0001-vlan-query_check-check-vlan-protocol-for-not-dotted-.patch b/debian/patches/upstream/0001-vlan-query_check-check-vlan-protocol-for-not-dotted-.patch
new file mode 100644
index 0000000..402c5e2
--- /dev/null
+++ b/debian/patches/upstream/0001-vlan-query_check-check-vlan-protocol-for-not-dotted-.patch
@@ -0,0 +1,88 @@
+From e50a7ccadb460bf923d841d620080f351fd74d9d Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier@odiso.com>
+Date: Thu, 20 Apr 2023 11:48:11 +0200
+Subject: [PATCH] vlan: query_check: check vlan-protocol for not dotted
+ interface
+
+---
+ ifupdown2/addons/vlan.py | 44 +++++++++++++++++++++-------------------
+ 1 file changed, 23 insertions(+), 21 deletions(-)
+
+diff --git a/ifupdown2/addons/vlan.py b/ifupdown2/addons/vlan.py
+index 584fe6e..3b045dc 100644
+--- a/ifupdown2/addons/vlan.py
++++ b/ifupdown2/addons/vlan.py
+@@ -224,10 +224,13 @@ class vlan(Addon, moduleBase):
+ def _query_check(self, ifaceobj, ifaceobjcurr):
+ if not self.cache.link_exists(ifaceobj.name):
+ return
++
++ ifname = ifaceobj.name
++ cached_vlan_info_data = self.cache.get_link_info_data(ifname)
++
+ if '.' not in ifaceobj.name:
+ # if vlan name is not in the dot format, check its running state
+
+- ifname = ifaceobj.name
+ cached_vlan_raw_device = self.cache.get_lower_device_ifname(ifname)
+
+ #
+@@ -239,8 +242,6 @@ class vlan(Addon, moduleBase):
+ cached_vlan_raw_device != ifaceobj.get_attr_value_first('vlan-raw-device')
+ )
+
+- cached_vlan_info_data = self.cache.get_link_info_data(ifname)
+-
+ #
+ # vlan-id
+ #
+@@ -252,27 +253,28 @@ class vlan(Addon, moduleBase):
+ cached_vlan_id_str = str(cached_vlan_id)
+ ifaceobjcurr.update_config_with_status('vlan-id', cached_vlan_id_str, vlanid_config != cached_vlan_id_str)
+
+- #
+- # vlan-protocol
+- #
+- protocol_config = ifaceobj.get_attr_value_first('vlan-protocol')
+- if protocol_config:
++ #
++ # vlan-protocol (dot or not dot format)
++ #
++ protocol_config = ifaceobj.get_attr_value_first('vlan-protocol')
++ if protocol_config:
+
+- cached_vlan_protocol = cached_vlan_info_data.get(Link.IFLA_VLAN_PROTOCOL)
++ cached_vlan_protocol = cached_vlan_info_data.get(Link.IFLA_VLAN_PROTOCOL)
+
+- if protocol_config.upper() != cached_vlan_protocol.upper():
+- ifaceobjcurr.update_config_with_status(
+- 'vlan-protocol',
+- cached_vlan_protocol,
+- 1
+- )
+- else:
+- ifaceobjcurr.update_config_with_status(
+- 'vlan-protocol',
+- protocol_config,
+- 0
+- )
++ if protocol_config.upper() != cached_vlan_protocol.upper():
++ ifaceobjcurr.update_config_with_status(
++ 'vlan-protocol',
++ cached_vlan_protocol,
++ 1
++ )
++ else:
++ ifaceobjcurr.update_config_with_status(
++ 'vlan-protocol',
++ protocol_config,
++ 0
++ )
+
++ if '.' not in ifaceobj.name:
+ #
+ # vlan-bridge-binding
+ #
+--
+2.30.2
+
--
2.30.2
next prev parent reply other threads:[~2023-04-20 21:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 21:37 [pve-devel] [PATCH ifupdown2 0/2] fix #4683 : fix reload of vlan interfaces when attribute change Alexandre Derumier
2023-04-20 21:37 ` Alexandre Derumier [this message]
2023-04-20 21:37 ` [pve-devel] [PATCH ifupdown2 2/2] patch: add vlan interface ifdown/ifup when changes on reload, like for vxlan Alexandre Derumier
2023-04-22 7:03 ` Thomas Lamprecht
2023-04-22 7:01 ` [pve-devel] applied: Re: [PATCH ifupdown2 0/2] fix #4683 : fix reload of vlan interfaces when attribute change 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=20230420213711.687478-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