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 EF66F9E446 for ; Tue, 31 Oct 2023 12:20:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CB29C1A83A for ; Tue, 31 Oct 2023 12:20:00 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 ; Tue, 31 Oct 2023 12:20:00 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0422942D6E; Tue, 31 Oct 2023 12:20:00 +0100 (CET) Date: Tue, 31 Oct 2023 12:19:59 +0100 From: Wolfgang Bumiller To: Alexandre Derumier Cc: pve-devel@lists.proxmox.com Message-ID: References: <20231027115328.654782-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231027115328.654782-1-aderumier@odiso.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.103 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 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [evpnplugin.pm] Subject: Re: [pve-devel] [PATCH pve-network] Fix #4917: evpn: forbid vlan-aware bridge 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, 31 Oct 2023 11:20:31 -0000 On Fri, Oct 27, 2023 at 01:53:28PM +0200, Alexandre Derumier wrote: > Do it on vnet update instead throwing a warning at config generation. > > Signed-off-by: Alexandre Derumier > --- > src/PVE/Network/SDN/Zones/EvpnPlugin.pm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/PVE/Network/SDN/Zones/EvpnPlugin.pm b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm > index 5e9f8ec..655a9f0 100644 > --- a/src/PVE/Network/SDN/Zones/EvpnPlugin.pm > +++ b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm > @@ -117,7 +117,6 @@ sub generate_sdn_config { > > die "missing vxlan tag" if !$tag; > die "missing controller" if !$controller; > - warn "vlan-aware vnet can't be enabled with evpn plugin" if $vnet->{vlanaware}; What are the symptoms of this? If it's just ignored there could be existing setups where this might still be set, in which case we should keep the warning. From the code it seems the places where this property is used from the this package's base packages gets overridden so it would be ignored. But if it didn't work and those setups wouldn't stick around then it makes sense to remove it. > > my @peers = PVE::Tools::split_list($controller->{'peers'}); > > @@ -309,6 +308,7 @@ sub vnet_update_hook { > > raise_param_exc({ tag => "missing vxlan tag"}) if !defined($tag); > raise_param_exc({ tag => "vxlan tag max value is 16777216"}) if $tag > 16777216; > + raise_param_exc({ 'vlan-aware' => "vlan-aware option can't be enabled with evpn"}) if $vnet->{vlanaware}; > > # verify that tag is not already defined globally (vxlan-id are unique) > foreach my $id (keys %{$vnet_cfg->{ids}}) { > -- > 2.39.2