generateconfig: use uplink$id if interface don't exist

don't die, generate config, and we'll check error
with ifquery as interface don't exist

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/PVE/Network/Network/VlanPlugin.pm b/PVE/Network/Network/VlanPlugin.pm
index affa27431de4f59d776df51ce90927cbe64c86e5..f0119e495e0d20f7e52332f2d2769b9c903d8aa0 100644 (file)
--- a/PVE/Network/Network/VlanPlugin.pm
+++ b/PVE/Network/Network/VlanPlugin.pm
@@ -68,7 +68,6 @@ sub generate_network_config {
     my $vlanallowed = $plugin_config->{'vlan-allowed'};
 
     die "missing vlan tag" if !$tag;
-    die "uplink $uplink is not defined" if !$uplinks->{$uplink};
 
     eval {
        PVE::Network::Network::Plugin::parse_tag_number_or_range($vlanallowed, '4096', $tag) if $vlanallowed;
@@ -77,7 +76,7 @@ sub generate_network_config {
        die "vlan $tag is not allowed in transport $zoneid";
     }
 
-    my $iface = $uplinks->{$uplink};
+    my $iface = $uplinks->{$uplink} ? $uplinks->{$uplink} : "uplink$uplink";
     $iface .= ".$tag";
 
     my $config = "\n";

diff --git a/PVE/Network/Network/VxlanMulticastPlugin.pm b/PVE/Network/Network/VxlanMulticastPlugin.pm
index 16dc5933c7e9d0d8419178c8df35cb4a08f836a9..7898f79cc0a1485534d63e537c7cdd93e002f9dc 100644 (file)
--- a/PVE/Network/Network/VxlanMulticastPlugin.pm
+++ b/PVE/Network/Network/VxlanMulticastPlugin.pm
@@ -54,8 +54,7 @@ sub generate_network_config {
     my $vxlanallowed = $plugin_config->{'vxlan-allowed'};
 
     die "missing vxlan tag" if !$tag;
-    die "uplink $uplink is not defined" if !$uplinks->{$uplink};
-    my $iface = $uplinks->{$uplink};
+    my $iface = $uplinks->{$uplink} ? $uplinks->{$uplink} : "uplink$uplink";
 
     eval {
        PVE::Network::Network::Plugin::parse_tag_number_or_range($vxlanallowed, '16777216', $tag) if $vxlanallowed;