fix #5324: non vlanaware zone: add mtu to veth links

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

diff --git a/src/PVE/Network/SDN/Zones/VlanPlugin.pm b/src/PVE/Network/SDN/Zones/VlanPlugin.pm
index 6a68e8d8c5d7beda8c5e47dd17a671911323755a..13fb49ef6d1aa91f655d13ffe54b6a6a8ec74a24 100644 (file)
--- a/src/PVE/Network/SDN/Zones/VlanPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/VlanPlugin.pm
@@ -106,17 +106,20 @@ sub generate_sdn_config {
        @iface_config = ();
        push @iface_config, "link-type veth";
        push @iface_config, "veth-peer-name $vnet_uplinkpeer";
+       push @iface_config, "mtu $mtu" if $mtu;
        push(@{$config->{$vnet_uplink}}, @iface_config) if !$config->{$vnet_uplink};
 
        @iface_config = ();
        push @iface_config, "link-type veth";
        push @iface_config, "veth-peer-name $vnet_uplink";
+       push @iface_config, "mtu $mtu" if $mtu;
        push(@{$config->{$vnet_uplinkpeer}}, @iface_config) if !$config->{$vnet_uplinkpeer};
 
        @iface_config = ();
        push @iface_config, "bridge_ports $bridge_ports $vnet_uplinkpeer";
        push @iface_config, "bridge_stp off";
        push @iface_config, "bridge_fd 0";
+       push @iface_config, "mtu $mtu" if $mtu;
        push(@{$config->{$bridgevlan}}, @iface_config) if !$config->{$bridgevlan};
     }
 

diff --git a/src/test/zones/vlan/bridge/expected_sdn_interfaces b/src/test/zones/vlan/bridge/expected_sdn_interfaces
index f9e96d1dead4b0b591576df4493793c771152f3c..fc05ff75ffed1d93c22eaeec9046fc32d8070172 100644 (file)
--- a/src/test/zones/vlan/bridge/expected_sdn_interfaces
+++ b/src/test/zones/vlan/bridge/expected_sdn_interfaces
@@ -4,20 +4,24 @@ auto ln_myvnet
 iface ln_myvnet
        link-type veth
        veth-peer-name pr_myvnet
+       mtu 9200
 
 auto myvnet
 iface myvnet
        bridge_ports ln_myvnet
        bridge_stp off
        bridge_fd 0
+       mtu 9200
 
 auto pr_myvnet
 iface pr_myvnet
        link-type veth
        veth-peer-name ln_myvnet
+       mtu 9200
 
 auto vmbr0v100
 iface vmbr0v100
        bridge_ports  eth0.100 pr_myvnet
        bridge_stp off
        bridge_fd 0
+       mtu 9200

diff --git a/src/test/zones/vlan/bridge/sdn_config b/src/test/zones/vlan/bridge/sdn_config
index c6cfaaadfa76ef598b4910240e3cc86e79d652ba..c61e659cb0ba0cff035879df84cbabfbf69edb64 100644 (file)
--- a/src/test/zones/vlan/bridge/sdn_config
+++ b/src/test/zones/vlan/bridge/sdn_config
@@ -6,6 +6,6 @@
                       },
              },
   zones   => {
-               ids => { myzone => { bridge => "vmbr0", ipam => "pve", type => "vlan" } },
+               ids => { myzone => { bridge => "vmbr0", ipam => "pve", type => "vlan", mtu => "9200" } },
              },
 }