zones: evpn : add support for loopback

[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 d3dc8571c1a6d99f4cdecf69033a90a6826dfd4e..ca6bd8f2472d6714281e052bd6a506f20ee570fe 100644 (file)
--- a/PVE/Network/SDN/Zones/VlanPlugin.pm
+++ b/PVE/Network/SDN/Zones/VlanPlugin.pm
@@ -3,6 +3,7 @@ package PVE::Network::SDN::Zones::VlanPlugin;
 use strict;
 use warnings;
 use PVE::Network::SDN::Zones::Plugin;
+use PVE::Exception qw(raise raise_param_exc);
 
 use base('PVE::Network::SDN::Zones::Plugin');
 
@@ -32,23 +33,27 @@ sub options {
     return {
         nodes => { optional => 1},
        'bridge' => { optional => 0 },
-       mtu => { optional => 1 }
+       mtu => { optional => 1 },
+       dns => { optional => 1 },
+       reversedns => { optional => 1 },
+       dnszone => { optional => 1 },
+        ipam => { optional => 0 },
     };
 }
 
 # Plugin implementation
 sub generate_sdn_config {
-    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $interfaces_config, $config) = @_;
+    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $controller_cfg, $subnet_cfg, $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 $is_ovs = !-d "/sys/class/net/$bridge/brif";
 
     my $tag = $vnet->{tag};
     my $alias = $vnet->{alias};
-    my $mtu = $plugin_config->{mtu} if $plugin_config->{mtu};
+    my $mtu = $plugin_config->{mtu};
 
     my $vnet_uplink = "ln_".$vnetid;
     my $vnet_uplinkpeer = "pr_".$vnetid;
@@ -63,8 +68,9 @@ sub generate_sdn_config {
        @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";
+           push @iface_config, "ovs_options vlan_mode=dot1q-tunnel other_config:qinq-ethtype=802.1q tag=$tag";
        } else {
            push @iface_config, "ovs_options tag=$tag";
        }
@@ -75,14 +81,9 @@ sub generate_sdn_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";       
+       $vnet_uplink = "$bridge.$tag";
     } else {
 
         # keep vmbrXvY for compatibility with existing network
@@ -135,22 +136,60 @@ sub generate_sdn_config {
 }
 
 sub status {
-    my ($class, $plugin_config, $zone, $id, $vnet, $err_config, $status, $vnet_status, $zone_status) = @_;
+    my ($class, $plugin_config, $zone, $vnetid, $vnet, $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';
+
+    my $err_msg = [];
+    if (!-d "/sys/class/net/$bridge") {
+        push @$err_msg, "missing $bridge";
+       return $err_msg;
+    }
+
+    my $vlan_aware = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/bridge/vlan_filtering");
+    my $is_ovs = !-d "/sys/class/net/$bridge/brif";
+
+    my $tag = $vnet->{tag};
+    my $vnet_uplink = "ln_".$vnetid;
+    my $vnet_uplinkpeer = "pr_".$vnetid;
+
+    # ifaces to check
+    my $ifaces = [ $vnetid, $bridge ];
+    if($is_ovs) {
+       push @$ifaces, $vnet_uplink;
+    } elsif (!$vlan_aware) {
+       my $bridgevlan = $bridge."v".$tag;
+       push @$ifaces, $bridgevlan;
+       push @$ifaces, $vnet_uplink;
+       push @$ifaces, $vnet_uplinkpeer;
+    }
+
+    foreach my $iface (@{$ifaces}) {
+       if (!$status->{$iface}->{status}) {
+           push @$err_msg, "missing $iface";
+        } elsif ($status->{$iface}->{status} ne 'pass') {
+           push @$err_msg, "error iface $iface";
+       }
+    }
+    return $err_msg;
+}
+
+sub vnet_update_hook {
+    my ($class, $vnet_cfg, $vnetid, $zone_cfg) = @_;
+
+    my $vnet = $vnet_cfg->{ids}->{$vnetid};
+    my $tag = $vnet->{tag};
+
+    raise_param_exc({ tag => "missing vlan tag"}) if !defined($vnet->{tag});
+    raise_param_exc({ tag => "vlan tag max value is 4096"}) if $vnet->{tag} > 4096;
+
+    # verify that tag is not already defined in another vnet on same zone
+    foreach my $id (keys %{$vnet_cfg->{ids}}) {
+       next if $id eq $vnetid;
+       my $othervnet = $vnet_cfg->{ids}->{$id};
+       my $other_tag = $othervnet->{tag};
+       next if $vnet->{zone} ne $othervnet->{zone};
+       raise_param_exc({ tag => "tag $tag already exist in vnet $id"}) if $other_tag && $tag eq $other_tag;
     }
 }