Proxmox/pve-network
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-network.git synced 2025-01-23 02:04:20 +03:00
Code Releases Activity

vnets: allow duplicate tags in differents zones

Browse Source 
only vxlan need to be unique globally.

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2020-10-05 17:09:09 +02:00 committed by Thomas Lamprecht
parent e8736dac7b
commit 88d9562ba7
8 changed files with 68 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/API2/Network/SDN/Vnets.pm
View File

@ -192,7 +192,7 @@ __PACKAGE__->register_method ({
my $zoneid = $cfg->{ids}->{$id}->{zone};
my $plugin_config = $zone_cfg->{ids}->{$zoneid};
my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type});
$plugin->vnet_update_hook($cfg->{ids}->{$id});
$plugin->vnet_update_hook($cfg, $id, $zone_cfg);
PVE::Network::SDN::VnetPlugin->on_update_hook($id, $cfg);
@ -237,7 +237,7 @@ __PACKAGE__->register_method ({
my $zoneid = $cfg->{ids}->{$id}->{zone};
my $plugin_config = $zone_cfg->{ids}->{$zoneid};
my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type});
$plugin->vnet_update_hook($cfg->{ids}->{$id});
$plugin->vnet_update_hook($cfg, $id, $zone_cfg);
PVE::Network::SDN::VnetPlugin->on_update_hook($id, $cfg);

9
PVE/Network/SDN/VnetPlugin.pm
View File

@ -106,15 +106,6 @@ sub on_update_hook {
my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid);
raise_param_exc({ vlanaware => "vlanaware vnet is not compatible with subnets"}) if $subnets;
}
# verify that tag is not already defined in another vnet
if (defined($tag)) {
foreach my $id (keys %{$vnet_cfg->{ids}}) {
next if $id eq $vnetid;
my $othervnettag = $vnet_cfg->{ids}->{$id}->{tag};
raise_param_exc({ tag => "tag $tag already exist in vnet $id"}) if $othervnettag && $tag eq $othervnettag;
}
}
}
1;

20
PVE/Network/SDN/Zones/EvpnPlugin.pm
View File

@ -181,10 +181,24 @@ sub on_update_hook {
sub vnet_update_hook {
my ($class, $vnet) = @_;
my ($class, $vnet_cfg, $vnetid, $zone_cfg) = @_;
raise_param_exc({ tag => "missing vxlan tag"}) if !defined($vnet->{tag});
raise_param_exc({ tag => "vxlan tag max value is 16777216"}) if $vnet->{tag} > 16777216;
my $vnet = $vnet_cfg->{ids}->{$vnetid};
my $tag = $vnet->{tag};
raise_param_exc({ tag => "missing vxlan tag"}) if !defined($tag);
raise_param_exc({ tag => "vxlan tag max value is 16777216"}) if $tag > 16777216;
# verify that tag is not already defined globally (vxlan-id are unique)
foreach my $id (keys %{$vnet_cfg->{ids}}) {
next if $id eq $vnetid;
my $othervnet = $vnet_cfg->{ids}->{$id};
my $other_tag = $othervnet->{tag};
my $other_zoneid = $othervnet->{zone};
my $other_zone = $zone_cfg->{ids}->{$other_zoneid};
next if $other_zone->{type} ne 'vxlan' && $other_zone->{type} ne 'evpn';
raise_param_exc({ tag => "vxlan tag $tag already exist in vnet $id in zone $other_zoneid "}) if $other_tag && $tag eq $other_tag;
}
if (!defined($vnet->{mac})) {
my $dc = PVE::Cluster::cfs_read_file('datacenter.cfg');

2
PVE/Network/SDN/Zones/Plugin.pm
View File

@ -144,7 +144,7 @@ sub on_update_hook {
}
sub vnet_update_hook {
my ($class, $vnet) = @_;
my ($class, $vnet_cfg, $vnetid, $zone_cfg) = @_;
# do nothing by default
}

14
PVE/Network/SDN/Zones/QinQPlugin.pm
View File

@ -216,10 +216,22 @@ sub status {
}
sub vnet_update_hook {
my ($class, $vnet) = @_;
my ($class, $vnet_cfg, $vnetid, $zone_cfg) = @_;
my $vnet = $vnet_cfg->{ids}->{$vnetid};
my $tag = $vnet->{tag};
raise_param_exc({ tag => "missing vlan tag"}) if !defined($vnet->{tag});
raise_param_exc({ tag => "vlan tag max value is 4096"}) if $vnet->{tag} > 4096;
# verify that tag is not already defined in another vnet on same zone
foreach my $id (keys %{$vnet_cfg->{ids}}) {
next if $id eq $vnetid;
my $othervnet = $vnet_cfg->{ids}->{$id};
my $other_tag = $othervnet->{tag};
next if $vnet->{zone} ne $othervnet->{zone};
raise_param_exc({ tag => "tag $tag already exist in vnet $id"}) if $other_tag && $tag eq $other_tag;
}
}
1;

7
PVE/Network/SDN/Zones/SimplePlugin.pm
View File

@ -118,9 +118,12 @@ sub status {
sub vnet_update_hook {
my ($class, $vnet) = @_;
my ($class, $vnet_cfg, $vnetid, $zone_cfg) = @_;
raise_param_exc({ tag => "vlan tag is not allowed on simple bridge"}) if defined($vnet->{tag});
my $vnet = $vnet_cfg->{ids}->{$vnetid};
my $tag = $vnet->{tag};
raise_param_exc({ tag => "vlan tag is not allowed on simple zone"}) if defined($tag);
if (!defined($vnet->{mac})) {
my $dc = PVE::Cluster::cfs_read_file('datacenter.cfg');

14
PVE/Network/SDN/Zones/VlanPlugin.pm
View File

@ -175,10 +175,22 @@ sub status {
}
sub vnet_update_hook {
my ($class, $vnet) = @_;
my ($class, $vnet_cfg, $vnetid, $zone_cfg) = @_;
my $vnet = $vnet_cfg->{ids}->{$vnetid};
my $tag = $vnet->{tag};
raise_param_exc({ tag => "missing vlan tag"}) if !defined($vnet->{tag});
raise_param_exc({ tag => "vlan tag max value is 4096"}) if $vnet->{tag} > 4096;
# verify that tag is not already defined in another vnet on same zone
foreach my $id (keys %{$vnet_cfg->{ids}}) {
next if $id eq $vnetid;
my $othervnet = $vnet_cfg->{ids}->{$id};
my $other_tag = $othervnet->{tag};
next if $vnet->{zone} ne $othervnet->{zone};
raise_param_exc({ tag => "tag $tag already exist in vnet $id"}) if $other_tag && $tag eq $other_tag;
}
}
1;

20
PVE/Network/SDN/Zones/VxlanPlugin.pm
View File

@ -94,10 +94,24 @@ sub generate_sdn_config {
}
sub vnet_update_hook {
my ($class, $vnet) = @_;
my ($class, $vnet_cfg, $vnetid, $zone_cfg) = @_;
raise_param_exc({ tag => "missing vxlan tag"}) if !defined($vnet->{tag});
raise_param_exc({ tag => "vxlan tag max value is 16777216"}) if $vnet->{tag} > 16777216;
my $vnet = $vnet_cfg->{ids}->{$vnetid};
my $tag = $vnet->{tag};
raise_param_exc({ tag => "missing vxlan tag"}) if !defined($tag);
raise_param_exc({ tag => "vxlan tag max value is 16777216"}) if $tag > 16777216;
# verify that tag is not already defined globally (vxlan-id are unique)
foreach my $id (keys %{$vnet_cfg->{ids}}) {
next if $id eq $vnetid;
my $othervnet = $vnet_cfg->{ids}->{$id};
my $other_tag = $othervnet->{tag};
my $other_zoneid = $othervnet->{zone};
my $other_zone = $zone_cfg->{ids}->{$other_zoneid};
next if $other_zone->{type} ne 'vxlan' && $other_zone->{type} ne 'evpn';
raise_param_exc({ tag => "vxlan tag $tag already exist in vnet $id in zone $other_zoneid "}) if $other_tag && $tag eq $other_tag;
}
}
1;