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 BCE191FF13C for ; Thu, 19 Feb 2026 16:05:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B7C781A57F; Thu, 19 Feb 2026 16:06:55 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager 06/11] ui: fabrics: node: make ipv4/6 support generic over edit panels Date: Thu, 19 Feb 2026 15:56:39 +0100 Message-ID: <20260219145649.441418-23-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219145649.441418-1-s.hanreich@proxmox.com> References: <20260219145649.441418-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.177 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods 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. RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Message-ID-Hash: F2NIZCPMWDZ626FKO7VN4FFQYHJTYR27 X-Message-ID-Hash: F2NIZCPMWDZ626FKO7VN4FFQYHJTYR27 X-MailFrom: hoan@cray.proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This allows selectively enabling IPv4/6 in the child components, without having to re-define the respective fields in every child component. A later commit will introduce the Wireguard fabric, which will have neither a IPv4 nor IPv6 prefix for now, so the option to exclude those fields will be used there as well. Signed-off-by: Stefan Hanreich --- www/manager6/sdn/fabrics/NodeEdit.js | 44 ++++++++++++++----- .../sdn/fabrics/openfabric/NodeEdit.js | 14 ------ www/manager6/sdn/fabrics/ospf/NodeEdit.js | 2 + 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/www/manager6/sdn/fabrics/NodeEdit.js b/www/manager6/sdn/fabrics/NodeEdit.js index b3d9751aa..7cbea9608 100644 --- a/www/manager6/sdn/fabrics/NodeEdit.js +++ b/www/manager6/sdn/fabrics/NodeEdit.js @@ -11,6 +11,9 @@ Ext.define('PVE.sdn.Fabric.Node.Edit', { nodeId: undefined, protocol: undefined, + hasIpv4Support: true, + hasIpv6Support: true, + disallowedNodes: [], baseUrl: '/cluster/sdn/fabrics/node', @@ -22,17 +25,6 @@ Ext.define('PVE.sdn.Fabric.Node.Edit', { hidden: true, allowBlank: true, }, - { - xtype: 'proxmoxtextfield', - fieldLabel: gettext('IPv4'), - labelWidth: 120, - name: 'ip', - allowBlank: true, - skipEmptyText: true, - cbind: { - deleteEmpty: '{!isCreate}', - }, - }, ], additionalItems: [], @@ -52,6 +44,34 @@ Ext.define('PVE.sdn.Fabric.Node.Edit', { me.url = `${me.baseUrl}/${me.fabricId}`; } + if (me.hasIpv4Support) { + me.items.push({ + xtype: 'proxmoxtextfield', + fieldLabel: gettext('IPv4'), + labelWidth: 120, + name: 'ip', + allowBlank: true, + skipEmptyText: true, + cbind: { + deleteEmpty: '{!isCreate}', + }, + }); + } + + if (me.hasIpv6Support) { + me.items.push({ + xtype: 'proxmoxtextfield', + fieldLabel: gettext('IPv6'), + labelWidth: 120, + name: 'ip6', + allowBlank: true, + skipEmptyText: true, + cbind: { + deleteEmpty: '{!isCreate}', + }, + }); + } + me.nodeSelector = me.getNodeSelector(); me.interfaceSelector = me.getInterfaceSelector(); @@ -136,7 +156,7 @@ Ext.define('PVE.sdn.Fabric.Node.Edit', { }); }, - getNodeSelectorConfig: function() { + getNodeSelectorConfig: function () { let me = this; return { diff --git a/www/manager6/sdn/fabrics/openfabric/NodeEdit.js b/www/manager6/sdn/fabrics/openfabric/NodeEdit.js index 3a0fafbbd..8296ec13f 100644 --- a/www/manager6/sdn/fabrics/openfabric/NodeEdit.js +++ b/www/manager6/sdn/fabrics/openfabric/NodeEdit.js @@ -5,18 +5,4 @@ Ext.define('PVE.sdn.Fabric.OpenFabric.Node.Edit', { extraRequestParams: { protocol: 'openfabric', }, - - additionalItems: [ - { - xtype: 'proxmoxtextfield', - fieldLabel: gettext('IPv6'), - labelWidth: 120, - name: 'ip6', - allowBlank: true, - skipEmptyText: true, - cbind: { - deleteEmpty: '{!isCreate}', - }, - }, - ], }); diff --git a/www/manager6/sdn/fabrics/ospf/NodeEdit.js b/www/manager6/sdn/fabrics/ospf/NodeEdit.js index 2bec10468..370aee191 100644 --- a/www/manager6/sdn/fabrics/ospf/NodeEdit.js +++ b/www/manager6/sdn/fabrics/ospf/NodeEdit.js @@ -2,6 +2,8 @@ Ext.define('PVE.sdn.Fabric.Ospf.Node.Edit', { extend: 'PVE.sdn.Fabric.Node.Edit', protocol: 'ospf', + hasIpv6Support: false, + extraRequestParams: { protocol: 'ospf', }, -- 2.47.3