NetworkEdit : add support for vlan interfaces.

Edit only for now, create will come soon in another patch

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

diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm
index 02172f6d10ef157e3600ab83a906a2c368a13cb7..186434a05b713f2a0ec0edfdb3c68dfbec72d475 100644 (file)
--- a/PVE/API2/Network.pm
+++ b/PVE/API2/Network.pm
@@ -31,7 +31,7 @@ my $bond_mode_enum = [
     'lacp-balance-tcp', # OVS
     ];
 
-my $network_type_enum = ['bridge', 'bond', 'eth', 'alias', 
+my $network_type_enum = ['bridge', 'bond', 'eth', 'alias', 'vlan',
                         'OVSBridge', 'OVSBond', 'OVSPort', 'OVSIntPort'];
 
 my $confdesc = {

diff --git a/www/manager/Utils.js b/www/manager/Utils.js
index 0e2e8a231c10df2ae2359e6f051878b4754e4e3e..eda08d81304356fcd1c2d9ad39b9aa373733c880 100644 (file)
--- a/www/manager/Utils.js
+++ b/www/manager/Utils.js
@@ -127,6 +127,7 @@ Ext.define('PVE.Utils', { statics: {
        eth: gettext("Network Device"),
        bridge: 'Linux Bridge',
        bond: 'Linux Bond',
+       vlan: 'Linux Vlan interface',
        OVSBridge: 'OVS Bridge',
        OVSBond: 'OVS Bond',
        OVSPort: 'OVS Port',

diff --git a/www/manager/node/NetworkEdit.js b/www/manager/node/NetworkEdit.js
index 23ef08bd0b9d9654c66bd52572783017ed1897f0..43f69e33f44c5a99d6fb6931679214930d289a55 100644 (file)
--- a/www/manager/node/NetworkEdit.js
+++ b/www/manager/node/NetworkEdit.js
@@ -24,6 +24,8 @@ Ext.define('PVE.node.NetworkEdit', {
            iface_vtype = 'BondName';
        } else if (me.iftype === 'eth' && !me.create) {
            iface_vtype = 'InterfaceName';
+       } else if (me.iftype === 'vlan' && !me.create) {
+           iface_vtype = 'InterfaceName';
        } else if (me.iftype === 'OVSBridge') {
            iface_vtype = 'BridgeName';
        } else if (me.iftype === 'OVSBond') {