[pve-devel] [PATCH pve-network] Fix #4917: evpn: forbid vlan-aware bridge

[pve-devel] [PATCH pve-network] Fix #4917: evpn: forbid vlan-aware bridge

[Alexandre Derumier]

Do it on vnet update instead throwing a warning at config generation.

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
 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};
 
     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

Re: [pve-devel] [PATCH pve-network] Fix #4917: evpn: forbid vlan-aware bridge

[Wolfgang Bumiller]

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 <aderumier@odiso.com>
> ---
>  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

Re: [pve-devel] [PATCH pve-network] Fix #4917: evpn: forbid vlan-aware bridge

[DERUMIER, Alexandre]

Hi,

Could it be possible to apply this small pve-network patch ?


-------- Message initial --------
De: Alexandre Derumier <aderumier@odiso.com>
Répondre à: Proxmox VE development discussion <pve-
devel@lists.proxmox.com>
À: pve-devel@lists.proxmox.com
Objet: [pve-devel] [PATCH pve-network] Fix #4917: evpn: forbid vlan-
aware bridge
Date: 27/10/2023 13:53:28

Do it on vnet update instead throwing a warning at config generation.

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
 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};
 
     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}}) {

[pve-devel] applied: [PATCH pve-network] Fix #4917: evpn: forbid vlan-aware bridge

[Thomas Lamprecht]

Am 27/10/2023 um 13:53 schrieb Alexandre Derumier:
> Do it on vnet update instead throwing a warning at config generation.
> 
> Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
> ---
>  src/PVE/Network/SDN/Zones/EvpnPlugin.pm | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
>

applied, thanks!