vxlanmulticast : fix mtu

vxlan mtu must be 50bytes lower than physdev mtu

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

diff --git a/PVE/Network/Network/VlanPlugin.pm b/PVE/Network/Network/VlanPlugin.pm
index 115d3bec4d2827a8317a685ee4db3604910164e4..063ae4996ebc971621def57af511e6b343b25801 100644 (file)
--- a/PVE/Network/Network/VlanPlugin.pm
+++ b/PVE/Network/Network/VlanPlugin.pm
@@ -69,9 +69,8 @@ sub generate_network_config {
 
     die "missing vlan tag" if !$tag;
 
-    my $iface = $uplinks->{$uplink} ? $uplinks->{$uplink} : "uplink$uplink";
+    my $iface = $uplinks->{$uplink}->{name} ? $uplinks->{$uplink}->{name} : "uplink$uplink";
     $iface .= ".$tag";
-
     my $config = "\n";
     $config .= "auto $iface\n";
     $config .= "iface $iface inet manual\n";

diff --git a/PVE/Network/Network/VxlanMulticastPlugin.pm b/PVE/Network/Network/VxlanMulticastPlugin.pm
index 2f03f487b6cd444eb7caca31ecbf082a390baf00..f5440067a9a4ff5b99679410e633e0f4dec3f5a0 100644 (file)
--- a/PVE/Network/Network/VxlanMulticastPlugin.pm
+++ b/PVE/Network/Network/VxlanMulticastPlugin.pm
@@ -47,14 +47,17 @@ sub generate_network_config {
     my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $uplinks) = @_;
 
     my $tag = $vnet->{tag};
-    my $mtu = $vnet->{mtu};
     my $alias = $vnet->{alias};
     my $multicastaddress = $plugin_config->{'multicast-address'};
     my $uplink = $plugin_config->{'uplink-id'};
     my $vxlanallowed = $plugin_config->{'vxlan-allowed'};
 
     die "missing vxlan tag" if !$tag;
-    my $iface = $uplinks->{$uplink} ? $uplinks->{$uplink} : "uplink$uplink";
+    my $iface = $uplinks->{$uplink}->{name} ? $uplinks->{$uplink}->{name} : "uplink$uplink";
+
+    my $mtu = 1450;
+    $mtu = $uplinks->{$uplink}->{mtu} - 50 if $uplinks->{$uplink}->{mtu};
+    $mtu = $vnet->{mtu} if $vnet->{mtu};
 
     my $config = "\n";
     $config .= "auto vxlan$tag\n";

diff --git a/test/generateconfig.pl b/test/generateconfig.pl
index fa4e74f68dc85fc678714d7a6fb0deef213b1840..4921d97f95a8c054fbb4f3f4d5ec229d55109c74 100644 (file)
--- a/test/generateconfig.pl
+++ b/test/generateconfig.pl
@@ -35,7 +35,8 @@ sub generate_network_config {
         my $interface = $interfaces_config->{ifaces}->{$id};
        if (my $uplink = $interface->{'uplink-id'}) {
                die "uplink-id $uplink is already defined on $uplinks->{$uplink}" if $uplinks->{$uplink};
-               $uplinks->{$interface->{'uplink-id'}} = $id;
+               $interface->{name} = $id;
+               $uplinks->{$interface->{'uplink-id'}} = $interface;
        }
      }