From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id B09451FF168 for ; Tue, 12 Nov 2024 10:26:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1FE211BAF2; Tue, 12 Nov 2024 10:26:28 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Tue, 12 Nov 2024 10:25:51 +0100 Message-Id: <20241112092554.106723-2-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241112092554.106723-1-a.lauterer@proxmox.com> References: <20241112092554.106723-1-a.lauterer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.037 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH widget-toolkit v6 1/4] fix #3892: Network: add bridge vids field for bridge_vids X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The new optional bridge_vids field allows to set that property via the GUI. Since the backend needs to support it, the field needs to be explicitly enabled. For now, Proxmox VE (PVE) is the use case. Signed-off-by: Aaron Lauterer Tested-By: Stefan Hanreich Reviewed-by: Shannon Sterz --- changes since v5: change label to "VLAN IDs" v4: none v3: * switched regex to one with non-capturing group * reworked valid VLAN check according to the suggestion v2: * added validation code following how it is implemented in the API src/node/NetworkEdit.js | 65 +++++++++++++++++++++++++++++++++++++++++ src/node/NetworkView.js | 5 ++++ 2 files changed, 70 insertions(+) diff --git a/src/node/NetworkEdit.js b/src/node/NetworkEdit.js index 27c1baf..2529acc 100644 --- a/src/node/NetworkEdit.js +++ b/src/node/NetworkEdit.js @@ -2,6 +2,9 @@ Ext.define('Proxmox.node.NetworkEdit', { extend: 'Proxmox.window.Edit', alias: ['widget.proxmoxNodeNetworkEdit'], + // Enable to show the VLAN ID field + bridge_set_vids: false, + initComponent: function() { let me = this; @@ -57,11 +60,70 @@ Ext.define('Proxmox.node.NetworkEdit', { } if (me.iftype === 'bridge') { + let vids = Ext.create('Ext.form.field.Text', { + fieldLabel: gettext('VLAN IDs'), + name: 'bridge_vids', + emptyText: '2-4094', + disabled: true, + autoEl: { + tag: 'div', + 'data-qtip': gettext('Space-separated list of VLANs and ranges, for example: 2 4 100-200'), + }, + validator: function(value) { + if (!value) { // empty + return true; + } + + let vid_list = value.split(' '); + + let invalidVid = function(tag) { + if (!isNaN(tag) && (tag < 2 || tag > 4094)) { + return `not a valid VLAN ID '${tag}'`; + } + + return false; + }; + + for (const vid of vid_list) { + if (!vid) { + continue; + } + let res = vid.match(/^(\d+)(?:-(\d+))?$/); + if (!res) { + return `not a valid VLAN configuration '${vid}'`; + } + let start = Number(res[1]); + let end = Number(res[2]); + + res = invalidVid(start); + if (res) { + return res; + } + + res = invalidVid(end); + if (res) { + return res; + } + + if (start >= end) { + return `VID range must go from lower to higher tag: '${vid}'`; + } + } + return true; + }, + }); column2.push({ xtype: 'proxmoxcheckbox', fieldLabel: gettext('VLAN aware'), name: 'bridge_vlan_aware', deleteEmpty: !me.isCreate, + listeners: { + change: function(f, newVal) { + if (me.bridge_set_vids) { + vids.setDisabled(!newVal); + } + }, + }, }); column2.push({ xtype: 'textfield', @@ -72,6 +134,9 @@ Ext.define('Proxmox.node.NetworkEdit', { 'data-qtip': gettext('Space-separated list of interfaces, for example: enp0s0 enp1s0'), }, }); + if (me.bridge_set_vids) { + advancedColumn2.push(vids); + } } else if (me.iftype === 'OVSBridge') { column2.push({ xtype: 'textfield', diff --git a/src/node/NetworkView.js b/src/node/NetworkView.js index 1d67ac8..c08cbfa 100644 --- a/src/node/NetworkView.js +++ b/src/node/NetworkView.js @@ -33,6 +33,9 @@ Ext.define('Proxmox.node.NetworkView', { showApplyBtn: false, + // decides if VLAN IDs field for bridges is shown, depends on the product if needed + bridge_set_vids: false, + initComponent: function() { let me = this; @@ -100,6 +103,7 @@ Ext.define('Proxmox.node.NetworkView', { nodename: me.nodename, iface: rec.data.iface, iftype: rec.data.type, + bridge_set_vids: me.bridge_set_vids, listeners: { destroy: () => reload(), }, @@ -170,6 +174,7 @@ Ext.define('Proxmox.node.NetworkView', { nodename: me.nodename, iftype: iType, iface_default: findNextFreeInterfaceId(iDefault ?? iType), + bridge_set_vids: me.bridge_set_vids, onlineHelp: 'sysadmin_network_configuration', listeners: { destroy: () => reload(), -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel