kvm network: allow to configure VLAN Id on the GUI

debian/changelog.Debian

+pve-manager (2.0-50) unstable; urgency=low
+
+  * kvm network: allow to configure VLAN Id on the GUI
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 28 Mar 2012 07:11:55 +0200
+
 pve-manager (2.0-49) unstable; urgency=low
 
   * improve HA task display

defines.mk

@@ -2,7 +2,7 @@ RELEASE=2.0
 
 VERSION=2.0
 PACKAGE=pve-manager
-PACKAGERELEASE=49
+PACKAGERELEASE=50
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5

www/manager/Parser.js

@@ -52,6 +52,9 @@ Ext.define('PVE.Parser', { statics: {
 	}
 	if (net.bridge) {
 	    netstr += ",bridge=" + net.bridge;
+	    if (net.tag) {
+		netstr += ",tag=" + net.tag;
+	    }
 	}
 	if (net.rate) {
 	    netstr += ",rate=" + net.rate;

www/manager/qemu/NetworkEdit.js

@@ -12,6 +12,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', {
 	    return {};
 	} else if (values.networkmode === 'bridge') {
 	    me.network.bridge = values.bridge;
+	    me.network.tag = values.tag;
 	} else {
 	    me.network.bridge = undefined;
 	}
@@ -82,10 +83,22 @@ Ext.define('PVE.qemu.NetworkInputPanel', {
 			}
 			me.down('field[name=bridge]').setDisabled(!value);
 			me.down('field[name=bridge]').validate();
+			me.down('field[name=tag]').setDisabled(!value);
 		    }
 		}
 	    },
 	    me.bridgesel,
+	    {
+		xtype: 'numberfield',
+		name: 'tag',
+		minValue: 1,
+		maxValue: 4094,
+		value: '',
+		emptyText: 'no VLAN',
+		fieldLabel: 'VLAN Tag',
+		labelAlign: 'right',
+		allowBlank: true
+	    },
 	    {
 		xtype: 'radiofield',
 		name: 'networkmode',