X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FINotify.pm;h=fd543132a3b5bfdbc2b775a21a694fe8b7887858;hp=f83759673e9bdefa19d7cc1aeb7382c5c65ccb53;hb=d949babe56bde89b2935bfab041574e360a1201e;hpb=9194ee0657800037907ae8670cfdb214952f18bf

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index f837596..fd54313 100644
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -16,6 +16,7 @@ use PVE::Exception qw(raise_param_exc);
 use PVE::Network;
 use PVE::Tools;
 use PVE::ProcFSTools;
+use PVE::JSONSchema;
 use Clone qw(clone);
 use Linux::Inotify2;
 use base 'Exporter';
@@ -954,6 +955,8 @@ sub __read_etc_network_interfaces {
 			'bridge-multicast-flood' => 1,
 			'bond_miimon' => 1,
 			'bond_xmit_hash_policy' => 1,
+			'uplink-id' => 1,
+			'vlan-protocol' => 1,
 			'vxlan-id' => 1,
 			'vxlan-svcnodeip' => 1,
 			'vxlan-physdev' => 1,
@@ -1102,6 +1105,33 @@ sub __read_etc_network_interfaces {
 	    }
 	}
 
+	# map address and netmask to cidr
+	if ($d->{address}) {
+	    if ($d->{netmask} && $d->{netmask} =~ m/^\d+$/) { # e.g. netmask 20
+		$d->{cidr} = $d->{address} . "/" . $d->{netmask};
+	    } elsif ($d->{netmask} &&
+		     (my $cidr = PVE::JSONSchema::get_netmask_bits($d->{netmask}))) { # e.g. netmask 255.255.255.0
+		$d->{cidr} = $d->{address} . "/" . $cidr;
+	    } elsif ($d->{address} =~ m!^(.*)/(\d+)$!) {
+		$d->{cidr} = $d->{address};
+		$d->{address} = $1;
+		$d->{netmask} = $2;
+	    } else {
+		$d->{cidr} = $d->{address};
+	    }
+	}
+
+	# map address6 and netmask6 to cidr6
+	if ($d->{address6}) {
+	    $d->{cidr6} = $d->{address6};
+	    if ($d->{netmask6}) {
+		$d->{cidr6} .= "/" . $d->{netmask6};
+	    } elsif ($d->{address6} =~ m!^(.*)/(\d+)$!) {
+		$d->{address6} = $1;
+		$d->{netmask6} = $2;
+	    }
+	}
+
 	$d->{method} = 'manual' if !$d->{method};
 	$d->{method6} = 'manual' if !$d->{method6};
 
@@ -1154,7 +1184,7 @@ sub __interface_to_string {
 		 comments => 1, autostart => 1, options => 1,
 		 address => 1, netmask => 1, gateway => 1, broadcast => 1,
 		 method6 => 1, families => 1, options6 => 1,
-		 address6 => 1, netmask6 => 1, gateway6 => 1, broadcast6 => 1 };
+		 address6 => 1, netmask6 => 1, gateway6 => 1, broadcast6 => 1, 'uplink-id' => 1 };
 
     if (!$first_block) {
 	# not printing out options
@@ -1201,6 +1231,10 @@ 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 'vlan') {
+	die "$iface: wrong vlan-protocol $d->{'vlan-protocol'}\n" 
+	    if $d->{'vlan-protocol'} && $d->{'vlan-protocol'} ne '802.1ad' && $d->{'vlan-protocol'} ne '802.1q';
+	
     } elsif ($d->{type} eq 'vxlan') {
 
 	foreach my $k (qw(vxlan-id vxlan-svcnodeip vxlan-physdev vxlan-local-tunnelip)) {
@@ -1312,6 +1346,9 @@ sub __write_etc_network_interfaces {
     foreach my $iface (keys %$ifaces) {
 	my $d = $ifaces->{$iface};
 
+	delete $d->{cidr};
+	delete $d->{cidr6};
+
 	my $ports = '';
 	foreach my $k (qw(bridge_ports ovs_ports slaves ovs_bonds)) {
 	    $ports .= " $d->{$k}" if $d->{$k};
@@ -1441,11 +1478,28 @@ sub __write_etc_network_interfaces {
 
 	    if ($n->{type} eq 'bridge' && !$n->{bridge_vlan_aware}) {
 		die "vlan '$iface' - bridge vlan aware is not enabled on parent '$p'\n";
-	    } elsif ($n->{type} ne 'eth' && $n->{type} ne 'bridge' && $n->{type} ne 'bond') {
+	    } elsif ($n->{type} ne 'eth' && $n->{type} ne 'bridge' && $n->{type} ne 'bond' && $n->{type} ne 'vlan') {
 		die "vlan '$iface' - wrong interface type on parent '$p' " .
-		    "('$n->{type}' != 'eth|bond|bridge' )\n";
+		    "('$n->{type}' != 'eth|bond|bridge|vlan' )\n";
 	    }
+
 	    &$check_mtu($ifaces, $p, $iface);
+
+	}
+    }
+
+    # check uplink
+    my $uplinks = {};
+    foreach my $iface (keys %$ifaces) {
+	my $d = $ifaces->{$iface};
+	if (my $uplinkid = $d->{'uplink-id'}) {
+	    die "iface '$iface' - uplink-id $uplinkid is only allowed on physical and linux bond interfaces\n"
+		if $d->{type} ne 'eth' && $d->{type} ne 'bond'; 
+
+	    die "iface '$iface' - uplink-id $uplinkid is already assigned on '$uplinks->{$uplinkid}'\n"
+		if $uplinks->{$uplinkid};
+
+	    $uplinks->{$uplinkid} = $iface;
 	}
     }
 
@@ -1485,10 +1539,10 @@ sub __write_etc_network_interfaces {
 # Please do NOT modify this file directly, unless you know what
 # you're doing.
 #
-# If you want to manage part of the network configuration manually,
+# If you want to manage parts of the network configuration manually,
 # please utilize the 'source' or 'source-directory' directives to do
 # so.
-# PVE will preserve these directives, but will NOT its network
+# PVE will preserve these directives, but will NOT read its network
 # configuration from sourced files, so do not attempt to move any of
 # the PVE managed interfaces into external files!
 
@@ -1499,30 +1553,23 @@ NETWORKDOC
     my $if_type_hash = {
 	loopback => 100000,
 	eth => 200000,
+	OVSPort => 200000,
+	OVSIntPort => 200000,
 	bond => 300000,
 	bridge => 400000,
+	OVSBridge => 400000,
 	vxlan => 500000,
    };
 
     my $lookup_type_prio = sub {
-	my $iface = shift;
+	my ($iface, $ifaces) = @_;
 
-	my $child = 0;
-	if ($iface =~ m/^(\S+)(\.|:)\d+$/) {
-	    $iface = $1;
-	    $child = 1;
-	}
+	my ($rootiface, @rest) = split(/[.:]/, $iface);
+	my $childlevel = scalar(@rest);
+	my $n = $ifaces->{$rootiface};
 
-	my $pri;
-	if ($iface eq 'lo') {
-	    $pri = $if_type_hash->{loopback};
-	} elsif ($iface =~ m/^$PVE::Network::PHYSICAL_NIC_RE$/) {
-	    $pri = $if_type_hash->{eth} + $child;
-	} elsif ($iface =~ m/^bond\d+$/) {
-	    $pri = $if_type_hash->{bond} + $child;
-	} elsif ($iface =~ m/^vmbr\d+$/) {
-	    $pri = $if_type_hash->{bridge} + $child;
-	}
+	my $pri = $if_type_hash->{$n->{type}} + $childlevel
+	    if $n->{type} && $n->{type} ne 'unknown';
 
 	return $pri;
     };
@@ -1530,8 +1577,8 @@ NETWORKDOC
     foreach my $iface (sort {
 	my $ref1 = $ifaces->{$a};
 	my $ref2 = $ifaces->{$b};
-	my $tp1 = &$lookup_type_prio($a);
-	my $tp2 = &$lookup_type_prio($b);
+	my $tp1 = &$lookup_type_prio($a, $ifaces);
+	my $tp2 = &$lookup_type_prio($b, $ifaces);
 
 	# Only recognized types are in relation to each other. If one type
 	# is unknown then only consider the interfaces' priority attributes.