From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 421271FF183 for ; Wed, 2 Jul 2025 16:54:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AFFB51F392; Wed, 2 Jul 2025 16:51:59 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Wed, 2 Jul 2025 16:50:48 +0200 Message-Id: <20250702145101.894299-64-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250702145101.894299-1-g.goller@proxmox.com> References: <20250702145101.894299-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.016 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 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 pve-manager v4 06/17] fabric: add generic node edit panel 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" From: Stefan Hanreich This component is the base EditWindow for Nodes of all protocols. It utilizes the existing network endpoint for getting information on the interfaces of the nodes, as well as the existing pveNodeSelector component for displaying a node dropdown. In the future we could provide a single endpoint that accumulates that information cluster-wide and returns it, eliminating the need for multiple API calls. If the node is configured but currently not in the quorate partition, we show a read-only panel with the current configuration and a warning. Co-authored-by: Stefan Hanreich Signed-off-by: Gabriel Goller --- www/manager6/Makefile | 1 + www/manager6/sdn/fabrics/NodeEdit.js | 224 +++++++++++++++++++++++++++ 2 files changed, 225 insertions(+) create mode 100644 www/manager6/sdn/fabrics/NodeEdit.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 56c87742f06c..922fd33ffd28 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -309,6 +309,7 @@ JSSRC= \ sdn/zones/VxlanEdit.js \ sdn/fabrics/Common.js \ sdn/fabrics/InterfacePanel.js \ + sdn/fabrics/NodeEdit.js \ sdn/fabrics/openfabric/InterfacePanel.js \ sdn/fabrics/ospf/InterfacePanel.js \ storage/ContentView.js \ diff --git a/www/manager6/sdn/fabrics/NodeEdit.js b/www/manager6/sdn/fabrics/NodeEdit.js new file mode 100644 index 000000000000..431287d5b3e2 --- /dev/null +++ b/www/manager6/sdn/fabrics/NodeEdit.js @@ -0,0 +1,224 @@ +Ext.define('PVE.sdn.Fabric.Node.Edit', { + extend: 'Proxmox.window.Edit', + mixins: ['Proxmox.Mixin.CBind'], + + width: 800, + subject: gettext('Node'), + + isCreate: undefined, + + fabricId: undefined, + nodeId: undefined, + protocol: undefined, + + disallowedNodes: [], + + baseUrl: "/cluster/sdn/fabrics/node", + + items: [ + { + xtype: 'textfield', + name: 'digest', + hidden: true, + allowBlank: true, + }, + { + xtype: 'proxmoxtextfield', + fieldLabel: gettext('IPv4'), + labelWidth: 120, + name: 'ip', + allowBlank: true, + skipEmptyText: true, + cbind: { + deleteEmpty: '{!isCreate}', + }, + }, + ], + + additionalItems: [], + + addAnotherCallback: undefined, + + initComponent: function() { + let me = this; + + me.isCreate = me.nodeId === undefined; + me.autoLoad = !me.isCreate; + me.method = me.isCreate ? 'POST' : 'PUT'; + + if (!me.isCreate) { + me.url = `${me.baseUrl}/${me.fabricId}/${me.nodeId}`; + } else { + me.url = `${me.baseUrl}/${me.fabricId}`; + } + + me.nodeSelector = me.getNodeSelector(); + me.interfaceSelector = me.getInterfaceSelector(); + + me.items = [ + me.nodeSelector, + ...me.items, + ...me.additionalItems, + me.interfaceSelector, + ]; + + me.callParent(); + + if (me.isCreate && me.addAnotherCallback) { + let addAnotherBtn = Ext.create('Ext.Button', { + text: gettext('Create another'), + disabled: !me.isCreate, + handler: function() { + me.apiCallDone = (success, _response, _options) => { + if (success) { + me.addAnotherCallback(); + } + }; + + me.submit(); + }, + }); + + let form = me.formPanel.getForm(); + + let set_button_status = function() { + let valid = form.isValid(); + let dirty = form.isDirty(); + addAnotherBtn.setDisabled(!valid || !(dirty || me.isCreate)); + }; + + form.on('dirtychange', set_button_status); + form.on('validitychange', set_button_status); + + me.getDockedItems()[0].add(addAnotherBtn); + } + }, + + loadNode: async function() { + let me = this; + + if (me.isCreate) { + return {}; + } + + let req = await Proxmox.Async.api2({ + url: `/cluster/sdn/fabrics/node/${me.fabricId}/${me.nodeId}`, + method: 'GET', + }); + + return req.result.data; + }, + + loadNodeInterfaces: async function() { + let me = this; + + let req = await Proxmox.Async.api2({ + url: `/api2/extjs/nodes/${me.nodeId}/network`, + method: 'GET', + }); + + return req.result.data.map((iface) => ({ + name: iface.iface, + type: iface.type, + ip: iface.cidr, + ipv6: iface.cidr6, + })); + }, + + load: function() { + let me = this; + + me.setLoading("fetching node information"); + + Promise.all([ + me.loadNode(me.fabricId, me.nodeId), + me.loadNodeInterfaces(me.nodeId), + ]) + .catch(Proxmox.Utils.alertResponseFailure) + .then(([node, nodeInterfaces]) => { + me.interfaceSelector.setNodeInterfaces(nodeInterfaces); + me.setValues(node); + }) + .finally(() => { + me.setLoading(false); + }); + }, + + getNodeSelector: function() { + let me = this; + + return Ext.create('PVE.form.NodeSelector', { + xtype: 'pveNodeSelector', + reference: 'nodeselector', + fieldLabel: gettext('Node'), + labelWidth: 120, + name: 'node_id', + allowBlank: false, + disabled: !me.isCreate, + disallowedNodes: me.disallowedNodes, + onlineValidator: me.isCreate, + autoSelect: me.isCreate, + listeners: { + change: function(f, value) { + if (me.isCreate) { + me.nodeId = value; + me.load(); + } + }, + }, + listConfig: { + columns: [ + { + header: gettext('Node'), + dataIndex: 'node', + sortable: true, + hideable: false, + flex: 1, + }, + ], + }, + store: { + fields: ['node'], + proxy: { + type: 'proxmox', + url: '/api2/json/nodes', + }, + sorters: [ + { + property: 'node', + direction: 'ASC', + }, + ], + listeners: { + load: function(store) { + if (store.count() === 0) { + Ext.Msg.alert( + gettext('Add Node'), + gettext('All available nodes are already part of the fabric'), + () => me.destroy(), + ); + } + }, + }, + }, + }); + }, + + getInterfacePanel: function(protocol) { + const INTERFACE_PANELS = { + openfabric: 'PVE.sdn.Fabric.OpenFabric.InterfacePanel', + ospf: 'PVE.sdn.Fabric.Ospf.InterfacePanel', + }; + + return INTERFACE_PANELS[protocol]; + }, + + getInterfaceSelector: function() { + let me = this; + + return Ext.create(me.getInterfacePanel(me.protocol), { + name: 'interfaces', + }); + }, +}); + -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel