vlan|qinq: add mtu to ovsint link port

[pve-network.git] / PVE / Network / SDN / Zones / VlanPlugin.pm

diff --git a/PVE/Network/SDN/Zones/VlanPlugin.pm b/PVE/Network/SDN/Zones/VlanPlugin.pm
index 8951e9ba2687efb325910a5b83f296cbfac25c6f..3bff9707e38294f40906814fbcaf8d8793858cbb 100644 (file)
--- a/PVE/Network/SDN/Zones/VlanPlugin.pm
+++ b/PVE/Network/SDN/Zones/VlanPlugin.pm
@@ -21,10 +21,8 @@ sub pve_verify_sdn_vlanrange {
 
 sub properties {
     return {
-       'uplink-id' => {
-           type => 'integer',
-           minimum => 1, maximum => 4096,
-           description => 'Uplink interface',
+       'bridge' => {
+           type => 'string',
        },
     };
 }
@@ -33,35 +31,103 @@ sub options {
 
     return {
         nodes => { optional => 1},
-       'uplink-id' => { optional => 0 },
+       'bridge' => { optional => 0 },
+       mtu => { optional => 1 }
     };
 }
 
 # Plugin implementation
 sub generate_sdn_config {
-    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $uplinks, $controller, $config) = @_;
+    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $interfaces_config, $config) = @_;
+
+    my $bridge = $plugin_config->{bridge};
+    die "can't find bridge $bridge" if !-d "/sys/class/net/$bridge";
+
+    my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
+    my $is_ovs = 1 if !-d "/sys/class/net/$bridge/brif";
 
     my $tag = $vnet->{tag};
-    my $mtu = $vnet->{mtu};
     my $alias = $vnet->{alias};
-    my $uplink = $plugin_config->{'uplink-id'};
+    my $mtu = $plugin_config->{mtu} if $plugin_config->{mtu};
 
-    die "missing vlan tag" if !$tag;
+    my $vnet_uplink = "ln_".$vnetid;
+    my $vnet_uplinkpeer = "pr_".$vnetid;
 
-    my $iface = $uplinks->{$uplink}->{name};
-    $iface = "uplink${uplink}" if !$iface;
-    $iface .= ".$tag";
-
-    #tagged interface
     my @iface_config = ();
-    push @iface_config, "mtu $mtu" if $mtu;
-    push(@{$config->{$iface}}, @iface_config) if !$config->{$iface};
+
+    if($is_ovs) {
+
+        # keep vmbrXvY for compatibility with existing network
+        # eth0----ovs vmbr0--(ovsintport tag)---->vnet---->vm
+
+       @iface_config = ();
+       push @iface_config, "ovs_type OVSIntPort";
+       push @iface_config, "ovs_bridge $bridge";
+       push @iface_config, "ovs_mtu $mtu" if $mtu;
+       if($vnet->{vlanaware}) {
+           push @iface_config, "ovs_options vlan_mode=dot1q-tunnel tag=$tag";
+       } else {
+           push @iface_config, "ovs_options tag=$tag";
+       }
+       push(@{$config->{$vnet_uplink}}, @iface_config) if !$config->{$vnet_uplink};
+
+       #redefine main ovs bridge, ifupdown2 will merge ovs_ports
+       @iface_config = ();
+       push @iface_config, "ovs_ports $vnet_uplink";
+       push(@{$config->{$bridge}}, @iface_config);
+
+       @iface_config = ();
+       push @iface_config, "ovs_type OVSBridge";
+       push @iface_config, "ovs_ports $vnet_uplink";
+       push(@{$config->{$bridge}}, @iface_config) if !$config->{$bridge};
+
+    } elsif ($vlan_aware) {
+        # eth0----vlanaware bridge vmbr0--(vmbr0.X tag)---->vnet---->vm
+       $vnet_uplink = "$bridge.$tag";       
+    } else {
+
+        # keep vmbrXvY for compatibility with existing network
+        # eth0<---->eth0.X----vmbr0v10------vnet---->vm
+
+       my $bridgevlan = $bridge."v".$tag;
+
+       my @bridge_ifaces = ();
+       my $dir = "/sys/class/net/$bridge/brif";
+       PVE::Tools::dir_glob_foreach($dir, '(((eth|bond)\d+|en[^.]+)(\.\d+)?)', sub {
+           push @bridge_ifaces, $_[0];
+       });
+
+       my $bridge_ports = "";
+       foreach my $bridge_iface (@bridge_ifaces) {
+           $bridge_ports .= " $bridge_iface.$tag";
+       }
+
+       @iface_config = ();
+       push @iface_config, "link-type veth";
+       push @iface_config, "veth-peer-name $vnet_uplinkpeer";
+       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(@{$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(@{$config->{$bridgevlan}}, @iface_config) if !$config->{$bridgevlan};
+    }
 
     #vnet bridge
     @iface_config = ();
-    push @iface_config, "bridge_ports $iface";
+    push @iface_config, "bridge_ports $vnet_uplink";
     push @iface_config, "bridge_stp off";
     push @iface_config, "bridge_fd 0";
+    if($vnet->{vlanaware}) {
+        push @iface_config, "bridge-vlan-aware yes";
+        push @iface_config, "bridge-vids 2-4094";
+    }
     push @iface_config, "mtu $mtu" if $mtu;
     push @iface_config, "alias $alias" if $alias;
     push(@{$config->{$vnetid}}, @iface_config) if !$config->{$vnetid};
@@ -69,6 +135,26 @@ sub generate_sdn_config {
     return $config;
 }
 
+sub status {
+    my ($class, $plugin_config, $zone, $id, $vnet, $err_config, $status, $vnet_status, $zone_status) = @_;
+
+    my $bridge = $plugin_config->{bridge};
+    $vnet_status->{$id}->{zone} = $zone;
+    $zone_status->{$zone}->{status} = 'available' if !defined($zone_status->{$zone}->{status});
+
+    if($err_config) {
+       $vnet_status->{$id}->{status} = 'pending';
+       $vnet_status->{$id}->{statusmsg} = $err_config;
+       $zone_status->{$zone}->{status} = 'pending';
+    } elsif ($status->{$bridge}->{status} && $status->{$bridge}->{status} eq 'pass') {
+       $vnet_status->{$id}->{status} = 'available';
+    } else {
+       $vnet_status->{$id}->{status} = 'error';
+       $vnet_status->{$id}->{statusmsg} = 'missing bridge';
+       $zone_status->{$zone}->{status} = 'error';
+    }
+}
+
 1;