Inotify : add vxlan interface support

[pve-common.git] / src / PVE / INotify.pm

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index a902b7315809fc8e160f4591e7fe63c6242aa2f4..dbc986841529daf100ec6b6a0a214ba7b2ef8a1d 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -813,7 +813,8 @@ sub __read_etc_network_interfaces {
        'bridge-vlan-aware' => 'bridge_vlan_aware',
        'bridge-fd' => 'bridge_fd',
        'bridge-stp' => 'bridge_stp',
-       'bridge-ports' => 'bridge_ports'
+       'bridge-ports' => 'bridge_ports',
+       'bridge-vids' => 'bridge_vids'
     };
 
     my $line;
@@ -895,7 +896,7 @@ sub __read_etc_network_interfaces {
                        } else {
                            $d->{$id} = 'off';
                        }
-                   } elsif ($id eq 'bridge_fd') {
+                   } elsif ($id eq 'bridge_fd' || $id eq 'bridge_vids') {
                        $d->{$id} = $value;
                    } elsif ($id eq 'bridge_vlan_aware') {
                        $d->{$id} = 1;
@@ -913,6 +914,11 @@ sub __read_etc_network_interfaces {
                            }
                        }
                        $d->{$id} = $value;
+                   } elsif ($id eq 'vxlan-id' || $id eq 'vxlan-svcnodeip' || 
+                            $id eq 'vxlan-physdev' || $id eq 'vxlan-local-tunnelip') {
+                       $d->{$id} = $value;
+                   } elsif ($id eq 'vxlan-remoteip') {
+                       push @{$d->{$id}}, $value;
                    } else {
                        push @{$f->{options}}, $option;
                    }
@@ -1009,7 +1015,9 @@ sub __read_etc_network_interfaces {
        } elsif ($iface =~ m/^lo$/) {
            $d->{type} = 'loopback';
        } else {
-           if (!$d->{ovs_type}) {
+           if ($d->{'vxlan-id'}) {
+               $d->{type} = 'vxlan';
+           } elsif (!$d->{ovs_type}) {
                $d->{type} = 'unknown';
            } elsif ($d->{ovs_type} eq 'OVSIntPort') {
                $d->{type} = $d->{ovs_type};
@@ -1052,7 +1060,7 @@ sub __read_etc_network_interfaces {
 }
 
 sub __interface_to_string {
-    my ($iface, $d, $family, $first_block) = @_;
+    my ($iface, $d, $family, $first_block, $ifupdown2) = @_;
 
     (my $suffix = $family) =~ s/^inet//;
 
@@ -1091,8 +1099,11 @@ sub __interface_to_string {
 
        if( defined($d->{bridge_vlan_aware})) {
            $raw .= "\tbridge-vlan-aware yes\n";
+           $v = defined($d->{bridge_vids}) ? $d->{bridge_vids} : "2-4094";
+           $raw .= "\tbridge-vids $v\n";
        }
        $done->{bridge_vlan_aware} = 1;
+       $done->{bridge_vids} = 1;
     
     } elsif ($d->{type} eq 'bond') {
 
@@ -1114,6 +1125,19 @@ sub __interface_to_string {
            $raw .= "\tbond-xmit-hash-policy $d->{'bond_xmit_hash_policy'}\n";
        }
        $done->{'bond_xmit_hash_policy'} = 1;
+    } elsif ($d->{type} eq 'vxlan') {
+
+        foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) {
+            $raw .= "\t$k $d->{$k}\n" if $d->{$k};
+           $done->{$k} = 1;
+        }
+
+       if ($d->{'vxlan-remoteip'}) {
+           foreach my $remoteip (@{$d->{'vxlan-remoteip'}}) {
+               $raw .= "\tvxlan-remoteip $remoteip\n";
+           }
+           $done->{'vxlan-remoteip'} = 1;
+       }
 
     } elsif ($d->{type} eq 'OVSBridge') {
 
@@ -1159,7 +1183,13 @@ sub __interface_to_string {
        $done->{ovs_type} = 1;
 
        if ($d->{ovs_bridge}) {
-           $raw = "allow-$d->{ovs_bridge} $iface\n$raw";
+
+           if ($ifupdown2) {
+               $raw = "auto $iface\n$raw";
+           } else {
+               $raw = "allow-$d->{ovs_bridge} $iface\n$raw";
+           }
+
            $raw .= "\tovs_bridge $d->{ovs_bridge}\n";
            $done->{ovs_bridge} = 1;
        }
@@ -1192,11 +1222,12 @@ sub __interface_to_string {
 
 sub write_etc_network_interfaces {
     my ($filename, $fh, $config) = @_;
-    my $raw = __write_etc_network_interfaces($config);
+    my $ifupdown2 = -e '/usr/share/ifupdown2';
+    my $raw = __write_etc_network_interfaces($config, $ifupdown2);
     PVE::Tools::safe_print($filename, $fh, $raw);
 }
 sub __write_etc_network_interfaces {
-    my ($config) = @_;
+    my ($config, $ifupdown2) = @_;
 
     my $ifaces = $config->{ifaces};
     my @options = @{$config->{options}};
@@ -1279,6 +1310,30 @@ sub __write_etc_network_interfaces {
        }
     }
 
+    # check vxlan
+    my $vxlans = {};
+    foreach my $iface (keys %$ifaces) {
+       my $d = $ifaces->{$iface};
+
+       if ($d->{type} eq 'vxlan' && $d->{'vxlan-id'}) {
+           my $vxlanid = $d->{'vxlan-id'};
+           die "iface $iface : duplicate vxlan-id $vxlanid already used in $vxlans->{$vxlanid}\n" if $vxlans->{$vxlanid};
+           $vxlans->{$vxlanid} = $iface;
+       }
+
+       my $ips = 0;
+       ++$ips if defined $d->{'vxlan-svcnodeip'};
+       ++$ips if defined $d->{'vxlan-remoteip'};
+       ++$ips if defined $d->{'vxlan-local-tunnelip'};
+       if ($ips > 1) {
+            die "ifac $iface : vxlan-svcnodeip, vxlan-remoteip and vxlan-localtunnelip are mutually exclusive\n";
+       }
+
+       if (defined($d->{'vxlan-svcnodeip'}) != defined($d->{'vxlan-physdev'})) {
+           die "iface $iface : vxlan-svcnodeip and vxlan-physdev must be define together\n";
+       }
+    }
+
     my $raw = <<'NETWORKDOC';
 # network interface settings; autogenerated
 # Please do NOT modify this file directly, unless you know what
@@ -1300,6 +1355,7 @@ NETWORKDOC
        eth => 200000,
        bond => 300000,
        bridge => 400000,
+       vxlan => 500000,
    };
 
     my $lookup_type_prio = sub {
@@ -1356,7 +1412,7 @@ NETWORKDOC
        $printed->{$iface} = 1;
        $raw .= "auto $iface\n" if $d->{autostart};
        my $i = 0; # some options should be printed only once
-       $raw .= __interface_to_string($iface, $d, $_, !$i++) foreach @{$d->{families}};
+       $raw .= __interface_to_string($iface, $d, $_, !$i++, $ifupdown2) foreach @{$d->{families}};
     }
 
     $raw .= $_->[1] . "\n" foreach @options;