renamme vlan option to tag

Signed-off-by: Derumier Alexandre <aderumier@odiso.com>

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 0b62d5ebd6e2f82b4e7ccb2418a74edc70ec1fce..806763ff20f2894b528aa8a13464e28af8b95f10 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -404,7 +404,7 @@ my $nic_model_list_txt = join(' ', sort @$nic_model_list);
 my $netdesc = {
     optional => 1,
     type => 'string', format => 'pve-qm-net',
-    typetext => "MODEL=XX:XX:XX:XX:XX:XX [,bridge=<dev>][,rate=<mbps>][,vlan=<vlanid>]",
+    typetext => "MODEL=XX:XX:XX:XX:XX:XX [,bridge=<dev>][,rate=<mbps>][,tag=<vlanid>]",
     description => <<EODESCR,
 Specify network devices.
 
@@ -1108,8 +1108,8 @@ sub parse_net {
            $res->{bridge} = $1;
        } elsif ($kvp =~ m/^rate=(\d+(\.\d+)?)$/) {
            $res->{rate} = $1;
-        } elsif ($kvp =~ m/^vlan=(\d+)$/) {
-            $res->{vlan} = $1;
+        } elsif ($kvp =~ m/^tag=(\d+)$/) {
+            $res->{tag} = $1;
        } else {
            return undef;
        }
@@ -1128,7 +1128,7 @@ sub print_net {
     $res .= "=$net->{macaddr}" if $net->{macaddr};
     $res .= ",bridge=$net->{bridge}" if $net->{bridge};
     $res .= ",rate=$net->{rate}" if $net->{rate};
-    $res .= ",vlan=$net->{vlan}" if $net->{vlan};
+    $res .= ",vlan=$net->{tag}" if $net->{tag};
 
     return $res;
 }

diff --git a/pve-bridge b/pve-bridge
index faf50fa496e3358c1eebd5ff38910de01e60d0c9..73f2b34f8aed257d7ad7b0ba19b812ece931f19b 100755 (executable)
--- a/pve-bridge
+++ b/pve-bridge
@@ -63,9 +63,9 @@ if ($net->{rate}) {
 
 }
 
-if ($net->{vlan}) {
+if ($net->{tag}) {
 
-    my $vlan = $net->{vlan};
+    my $vlan = $net->{tag};
     my $bridgevlan = $bridge."v".$vlan;
 
     #check if we have an only one ethX or bondX interface in the bridge