kvm network: allow to configure VLAN Id on the GUI

diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index bd84454bdfc52cbeca7aa7a64a6c9c547179b02a..e35947d0ff64ad81c8b1619652e8c01edf69cedd 100644 (file)
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -1,3 +1,9 @@
+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

diff --git a/defines.mk b/defines.mk
index be7d33673d5f12d9d0f1c181f327fe10f01cec68..21faf6e79ddbd8e4068748a03bfd94b71147ed42 100644 (file)
--- a/defines.mk
+++ b/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

diff --git a/www/manager/Parser.js b/www/manager/Parser.js
index 5bedb8e61f5acea2c46213ff49b455af6258de60..bc7bafd80b1d2e77612bb40e09cd8e89d4c2baea 100644 (file)
--- a/www/manager/Parser.js
+++ b/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;

diff --git a/www/manager/qemu/NetworkEdit.js b/www/manager/qemu/NetworkEdit.js
index 536813d9b0e0f8a0bc25634c9a6fcbd1e480da95..6ab85fc307ebe3cd6c861f8dfb7019a6e034ce17 100644 (file)
--- a/www/manager/qemu/NetworkEdit.js
+++ b/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',