Commit 7643161b authored by Dietmar Maurer's avatar Dietmar Maurer

lxc network: use 'bridge' property instead of 'link'

parent 2c6bc57d
...@@ -233,7 +233,7 @@ Ext.define('PVE.Parser', { statics: { ...@@ -233,7 +233,7 @@ Ext.define('PVE.Parser', { statics: {
if (!p || p.match(/^\s*$/)) { if (!p || p.match(/^\s*$/)) {
return; // continue return; // continue
} }
var match_res = p.match(/^(link|hwaddr|mtu|name|ip|ip6|gw|gw6)=(\S+)$/); var match_res = p.match(/^(bridge|hwaddr|mtu|name|ip|ip6|gw|gw6)=(\S+)$/);
if (!match_res) { if (!match_res) {
// todo: simply ignore errors ? // todo: simply ignore errors ?
return; // continue return; // continue
...@@ -246,7 +246,7 @@ Ext.define('PVE.Parser', { statics: { ...@@ -246,7 +246,7 @@ Ext.define('PVE.Parser', { statics: {
printLxcNetwork: function(data) { printLxcNetwork: function(data) {
var tmparray = []; var tmparray = [];
Ext.Array.each(['link', 'hwaddr', 'mtu', 'name', 'ip', Ext.Array.each(['bridge', 'hwaddr', 'mtu', 'name', 'ip',
'gw', 'ip6', 'gw6'], function(key) { 'gw', 'ip6', 'gw6'], function(key) {
var value = data[key]; var value = data[key];
if (value) { if (value) {
......
...@@ -13,7 +13,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { ...@@ -13,7 +13,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
me.nodename = nodename; me.nodename = nodename;
var bridgesel = me.query("[isFormField][name=link]")[0]; var bridgesel = me.query("[isFormField][name=bridge]")[0];
bridgesel.setNodename(nodename); bridgesel.setNodename(nodename);
}, },
...@@ -127,7 +127,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', { ...@@ -127,7 +127,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
}, },
{ {
xtype: 'PVE.form.BridgeSelector', xtype: 'PVE.form.BridgeSelector',
name: 'link', name: 'bridge',
nodename: me.nodename, nodename: me.nodename,
fieldLabel: gettext('Bridge'), fieldLabel: gettext('Bridge'),
value: cdata.bridge, value: cdata.bridge,
...@@ -377,7 +377,7 @@ Ext.define('PVE.lxc.NetworkView', { ...@@ -377,7 +377,7 @@ Ext.define('PVE.lxc.NetworkView', {
{ {
header: gettext('Bridge'), header: gettext('Bridge'),
width: 80, width: 80,
dataIndex: 'link' dataIndex: 'bridge'
}, },
{ {
header: gettext('Firewall'), header: gettext('Firewall'),
...@@ -439,7 +439,7 @@ Ext.define('PVE.lxc.NetworkView', { ...@@ -439,7 +439,7 @@ Ext.define('PVE.lxc.NetworkView', {
Ext.define('pve-lxc-network', { Ext.define('pve-lxc-network', {
extend: "Ext.data.Model", extend: "Ext.data.Model",
proxy: { type: 'memory' }, proxy: { type: 'memory' },
fields: [ 'id', 'name', 'hwaddr', 'link', fields: [ 'id', 'name', 'hwaddr', 'bridge',
'ip', 'gw', 'ip6', 'gw6', 'tag', 'firewall' ] 'ip', 'gw', 'ip6', 'gw6', 'tag', 'firewall' ]
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment