Inotify : write network config : add bridge-vids

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

diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm
index 445c0348699c26d46deec51b8bba9baca9ac950b..dcdbaa49121d7a77fd86350db736f88346d57674 100644 (file)
--- a/src/PVE/INotify.pm
+++ b/src/PVE/INotify.pm
@@ -804,6 +804,19 @@ sub __read_etc_network_interfaces {
     my $ifaces = $config->{ifaces} = {};
     my $options = $config->{options} = [];
 
+    my $options_alternatives = {
+       'bond-slaves' => 'slaves',
+       'bond_slaves' => 'slaves',
+       'bond-xmit-hash-policy' => 'bond_xmit_hash_policy',
+       'bond-mode' => 'bond_mode',
+       'bond-miimon' =>'bond_miimon',
+       'bridge-vlan-aware' => 'bridge_vlan_aware',
+       'bridge-fd' => 'bridge_fd',
+       'bridge-stp' => 'bridge_stp',
+       'bridge-ports' => 'bridge_ports',
+       'bridge-vids' => 'bridge_vids'
+    };
+
     my $line;
 
     if ($proc_net_dev) {
@@ -857,6 +870,9 @@ sub __read_etc_network_interfaces {
                } elsif ($line =~ m/^\s*((\S+)\s+(.+))$/) {
                    my $option = $1;
                    my ($id, $value) = ($2, $3);
+
+                   $id = $options_alternatives->{$id} if $options_alternatives->{$id};
+
                    if (($id eq 'address') || ($id eq 'netmask') || ($id eq 'broadcast') || ($id eq 'gateway')) {
                        $f->{$id} = $value;
                    } elsif ($id eq 'ovs_type' || $id eq 'ovs_options'|| $id eq 'ovs_bridge' ||
@@ -1063,19 +1079,21 @@ sub __interface_to_string {
 
        $d->{bridge_ports} =~ s/[;,\s]+/ /g;
        my $ports = $d->{bridge_ports} || 'none';
-       $raw .= "\tbridge_ports $ports\n";
+       $raw .= "\tbridge-ports $ports\n";
        $done->{bridge_ports} = 1;
 
        my $v = defined($d->{bridge_stp}) ? $d->{bridge_stp} : 'off';
-       $raw .= "\tbridge_stp $v\n";
+       $raw .= "\tbridge-stp $v\n";
        $done->{bridge_stp} = 1;
 
        $v = defined($d->{bridge_fd}) ? $d->{bridge_fd} : 0;
-       $raw .= "\tbridge_fd $v\n";
+       $raw .= "\tbridge-fd $v\n";
        $done->{bridge_fd} = 1;
 
        if( defined($d->{bridge_vlan_aware})) {
-           $raw .= "\tbridge_vlan_aware yes\n";
+           $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;
     
@@ -1083,20 +1101,20 @@ sub __interface_to_string {
 
        $d->{slaves} =~ s/[;,\s]+/ /g;
        my $slaves = $d->{slaves} || 'none';
-       $raw .= "\tslaves $slaves\n";
+       $raw .= "\tbond-slaves $slaves\n";
        $done->{slaves} = 1;
 
        my $v = defined ($d->{'bond_miimon'}) ? $d->{'bond_miimon'} : 100;
-       $raw .= "\tbond_miimon $v\n";
+       $raw .= "\tbond-miimon $v\n";
        $done->{'bond_miimon'} = 1;
 
        $v = defined ($d->{'bond_mode'}) ? $d->{'bond_mode'} : 'balance-rr';
-       $raw .= "\tbond_mode $v\n";
+       $raw .= "\tbond-mode $v\n";
        $done->{'bond_mode'} = 1;
 
        if ($d->{'bond_mode'} && $d->{'bond_xmit_hash_policy'} &&
            ($d->{'bond_mode'} eq 'balance-xor' || $d->{'bond_mode'} eq '802.3ad')) {
-           $raw .= "\tbond_xmit_hash_policy $d->{'bond_xmit_hash_policy'}\n";
+           $raw .= "\tbond-xmit-hash-policy $d->{'bond_xmit_hash_policy'}\n";
        }
        $done->{'bond_xmit_hash_policy'} = 1;