remove $interfaces arg from generate_network_config

and remove verification of existing vlan interface in VlanPlugin.
(we do all verifications later reusing INotify read/write interfaces)

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

diff --git a/PVE/Network/VlanPlugin.pm b/PVE/Network/VlanPlugin.pm
index cbeecf6f155af217c2f841610958443bd2f24677..a349890eba547943c2204b65fe33989ff2042825 100644 (file)
--- a/PVE/Network/VlanPlugin.pm
+++ b/PVE/Network/VlanPlugin.pm
@@ -52,7 +52,7 @@ sub options {
 
 # Plugin implementation
 sub generate_network_config {
 
 # Plugin implementation
 sub generate_network_config {

-    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $interfaces, $uplinks) = @_;
+    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $uplinks) = @_;

 
     my $tag = $vnet->{tag};
     my $mtu = $vnet->{mtu};
 
     my $tag = $vnet->{tag};
     my $mtu = $vnet->{mtu};


@@ -74,8 +74,6 @@ sub generate_network_config {
     my $iface = $uplinks->{$uplink};
     $iface .= ".$tag";
 
     my $iface = $uplinks->{$uplink};
     $iface .= ".$tag";
 

-    die "interface $iface already exist in main configuration" if ($interfaces->{iface}->{$iface});
-    

     my $config = "\n";
     $config .= "auto $iface\n";
     $config .= "iface $iface inet manual\n";
     my $config = "\n";
     $config .= "auto $iface\n";
     $config .= "iface $iface inet manual\n";

diff --git a/PVE/Network/VxlanMulticastPlugin.pm b/PVE/Network/VxlanMulticastPlugin.pm
index 13438491b85d899559b35b1ed01d2314d907bb8e..87499d823c9bb2d209de156714044995576382df 100644 (file)
--- a/PVE/Network/VxlanMulticastPlugin.pm
+++ b/PVE/Network/VxlanMulticastPlugin.pm
@@ -44,7 +44,7 @@ sub options {
 
 # Plugin implementation
 sub generate_network_config {
 
 # Plugin implementation
 sub generate_network_config {

-    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $interfaces, $uplinks) = @_;
+    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $uplinks) = @_;

 
     my $tag = $vnet->{tag};
     my $mtu = $vnet->{mtu};
 
     my $tag = $vnet->{tag};
     my $mtu = $vnet->{mtu};

diff --git a/test/generateconfig.pl b/test/generateconfig.pl
index 0f9658449126268092628bc38e174978e7ed2784..327983885c120ae080b1a8369a1b28c3043a5db0 100644 (file)
--- a/test/generateconfig.pl
+++ b/test/generateconfig.pl
@@ -51,7 +51,7 @@ sub generate_network_config {
             my $plugin_config = $transport_cfg->{ids}->{$zone};
             die "zone $zone don't exist" if !defined($plugin_config);
              my $plugin = PVE::Network::Plugin->lookup($plugin_config->{type});
             my $plugin_config = $transport_cfg->{ids}->{$zone};
             die "zone $zone don't exist" if !defined($plugin_config);
              my $plugin = PVE::Network::Plugin->lookup($plugin_config->{type});

-             $rawconfig .= $plugin->generate_network_config($plugin_config, $zone, $id, $vnet, $interfaces_config, $uplinks);
+             $rawconfig .= $plugin->generate_network_config($plugin_config, $zone, $id, $vnet, $uplinks);

         }
 
 return $rawconfig;
         }
 
 return $rawconfig;