JSONSchema: fix units of bwlimit

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

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index 1a6070873b950d660638bcbbdd176d1acca2b866..c52d99255c98d93e474e9a93f5e7621d99c25b71 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -1492,10 +1492,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!
 
@@ -1506,30 +1506,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;
     };
@@ -1537,8 +1530,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.