Allow the web UI to accept bridge interfaces with any valid interface
name, rather than being limited to the arbitrary "vmbr" prefix.
Limiting to at most 10 characters, since SDN possibly adds a .XXXX
prefix for Vlans. Since the hard limit for network interface names is
15 characters, limiting it to 10 characters here enables SDN to append
the VLAN prefix in any case.
Originally-by: Jillian Morgan <jillian.mor...@primordial.ca>
Signed-off-by: Stefan Hanreich <s.hanre...@proxmox.com>
---
src/Toolkit.js | 4 ++--
src/node/NetworkEdit.js | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/Toolkit.js b/src/Toolkit.js
index 6fd73f5..23d3a36 100644
--- a/src/Toolkit.js
+++ b/src/Toolkit.js
@@ -76,7 +76,7 @@ Ext.apply(Ext.form.field.VTypes, {
MacPrefixText: gettext('Example') + ': 02:8f - ' + gettext('only unicast
addresses are allowed'),
BridgeName: function(v) {
- return (/^vmbr\d{1,4}$/).test(v);
+ return (/^[a-zA-Z][a-zA-Z0-9_]{0,9}$/).test(v);
},
VlanName: function(v) {
if (Proxmox.Utils.VlanInterface_match.test(v)) {
@@ -86,7 +86,7 @@ Ext.apply(Ext.form.field.VTypes, {
}
return true;
},
- BridgeNameText: gettext('Format') + ': vmbr<b>N</b>, where 0 <= <b>N</b>
<= 9999',
+ BridgeNameText: gettext('Format') + ': alphanumeric string starting with a
character',
BondName: function(v) {
return (/^bond\d{1,4}$/).test(v);
diff --git a/src/node/NetworkEdit.js b/src/node/NetworkEdit.js
index bb9add3..33113d9 100644
--- a/src/node/NetworkEdit.js
+++ b/src/node/NetworkEdit.js
@@ -38,6 +38,8 @@ Ext.define('Proxmox.node.NetworkEdit', {
throw "unknown network device type specified";
}
+ let name_max_length = iface_vtype === 'BridgeName' ? 10 : 15;
+
me.subject = Proxmox.Utils.render_network_iface_type(me.iftype);
let column1 = [],
@@ -254,7 +256,7 @@ Ext.define('Proxmox.node.NetworkEdit', {
value: me.iface,
vtype: iface_vtype,
allowBlank: false,
- maxLength: 15,
+ maxLength: name_max_length,
autoEl: {
tag: 'div',
'data-qtip': gettext('For example, vmbr0.100, vmbr0,
vlan0.100, vlan0'),
--
2.39.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
