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 AD3489924C for ; Thu, 20 Apr 2023 23:37:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 90A332F85C for ; Thu, 20 Apr 2023 23:36:34 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 20 Apr 2023 23:36:33 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id F1EC282D8; Thu, 20 Apr 2023 23:36:25 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id F0DC6D1A14; Thu, 20 Apr 2023 23:36:25 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 20 Apr 2023 23:36:21 +0200 Message-Id: <20230420213622.685809-6-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230420213622.685809-1-aderumier@odiso.com> References: <20230420213622.685809-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.020 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.25 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network 5/6] fix #4683 : zones: qinq: fix vlan-protocol with bridge vlan aware 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: Thu, 20 Apr 2023 21:37:04 -0000 The tagged bridge interface need to also have to correct vlan-protocol Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Zones/QinQPlugin.pm | 8 ++++++-- .../bridge_vlanaware_vlanprotocol/expected_sdn_interfaces | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/PVE/Network/SDN/Zones/QinQPlugin.pm b/PVE/Network/SDN/Zones/QinQPlugin.pm index f4d12bc..8b9de43 100644 --- a/PVE/Network/SDN/Zones/QinQPlugin.pm +++ b/PVE/Network/SDN/Zones/QinQPlugin.pm @@ -98,13 +98,17 @@ sub generate_sdn_config { } elsif ($vlan_aware) { # VLAN_aware_brige-(tag)----->vlanwarebridge-(tag)----->vnet + $zone_bridge_ports = "$bridge.$stag"; + if ($vlanprotocol) { @iface_config = (); push @iface_config, "bridge-vlan-protocol $vlanprotocol"; push(@{$config->{$bridge}}, @iface_config) if !$config->{$bridge}; - } - $zone_bridge_ports = "$bridge.$stag"; + @iface_config = (); + push @iface_config, "vlan-protocol $vlanprotocol"; + push(@{$config->{$zone_bridge_ports}}, @iface_config) if !$config->{$zone_bridge_ports}; + } } else { # eth--->eth.x(svlan)----->vlanwarebridge-(tag)----->vnet---->vnet diff --git a/test/zones/qinq/bridge_vlanaware_vlanprotocol/expected_sdn_interfaces b/test/zones/qinq/bridge_vlanaware_vlanprotocol/expected_sdn_interfaces index 0bc301b..b24238f 100644 --- a/test/zones/qinq/bridge_vlanaware_vlanprotocol/expected_sdn_interfaces +++ b/test/zones/qinq/bridge_vlanaware_vlanprotocol/expected_sdn_interfaces @@ -20,6 +20,10 @@ auto vmbr0 iface vmbr0 bridge-vlan-protocol 802.1ad +auto vmbr0.10 +iface vmbr0.10 + vlan-protocol 802.1ad + auto z_myzone iface z_myzone bridge-stp off -- 2.30.2