[pve-devel] [PATCH pve-network 4/4] plugins: generate config: don't check vlan range
Alexandre Derumier
aderumier at odiso.com
Tue Jun 4 07:03:43 CEST 2019
we already have done it on create/modify hooks
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
PVE/Network/Network/VlanPlugin.pm | 7 -------
PVE/Network/Network/VxlanMulticastPlugin.pm | 7 -------
2 files changed, 14 deletions(-)
diff --git a/PVE/Network/Network/VlanPlugin.pm b/PVE/Network/Network/VlanPlugin.pm
index f0119e4..115d3be 100644
--- a/PVE/Network/Network/VlanPlugin.pm
+++ b/PVE/Network/Network/VlanPlugin.pm
@@ -69,13 +69,6 @@ sub generate_network_config {
die "missing vlan tag" if !$tag;
- eval {
- PVE::Network::Network::Plugin::parse_tag_number_or_range($vlanallowed, '4096', $tag) if $vlanallowed;
- };
- if($@) {
- die "vlan $tag is not allowed in transport $zoneid";
- }
-
my $iface = $uplinks->{$uplink} ? $uplinks->{$uplink} : "uplink$uplink";
$iface .= ".$tag";
diff --git a/PVE/Network/Network/VxlanMulticastPlugin.pm b/PVE/Network/Network/VxlanMulticastPlugin.pm
index 7898f79..2f03f48 100644
--- a/PVE/Network/Network/VxlanMulticastPlugin.pm
+++ b/PVE/Network/Network/VxlanMulticastPlugin.pm
@@ -56,13 +56,6 @@ sub generate_network_config {
die "missing vxlan tag" if !$tag;
my $iface = $uplinks->{$uplink} ? $uplinks->{$uplink} : "uplink$uplink";
- eval {
- PVE::Network::Network::Plugin::parse_tag_number_or_range($vxlanallowed, '16777216', $tag) if $vxlanallowed;
- };
- if($@) {
- die "vlan $tag is not allowed in transport $zoneid";
- }
-
my $config = "\n";
$config .= "auto vxlan$tag\n";
$config .= "iface vxlan$tag inet manual\n";
--
2.11.0
More information about the pve-devel
mailing list