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 4C3A41FF13C for ; Thu, 02 Apr 2026 10:14:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D481DDCAD; Thu, 2 Apr 2026 10:12:59 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v2 21/25] ui: fabrics: interface: make ipv4/6 support generic over edit panels Date: Thu, 2 Apr 2026 10:11:41 +0200 Message-ID: <20260402081148.76276-22-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260402081148.76276-1-s.hanreich@proxmox.com> References: <20260402081148.76276-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1775117457682 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.699 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 Message-ID-Hash: EWMNCCE5WBLSRCL272HHG34FLLOUHZZQ X-Message-ID-Hash: EWMNCCE5WBLSRCL272HHG34FLLOUHZZQ X-MailFrom: s.hanreich@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: From: Christoph Heiss 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. Co-authored-by: Stefan Hanreich --- www/manager6/sdn/fabrics/InterfacePanel.js | 18 ++++++++++++++++++ .../sdn/fabrics/openfabric/InterfacePanel.js | 13 ------------- .../sdn/fabrics/ospf/InterfacePanel.js | 2 ++ 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/www/manager6/sdn/fabrics/InterfacePanel.js b/www/manager6/sdn/fabrics/InterfacePanel.js index f75f1acd2..ab2162b1e 100644 --- a/www/manager6/sdn/fabrics/InterfacePanel.js +++ b/www/manager6/sdn/fabrics/InterfacePanel.js @@ -6,6 +6,8 @@ Ext.define('PVE.sdn.Fabric.InterfacePanel', { nodeInterfaces: {}, + hasIpv6Support: true, + selModel: { mode: 'SIMPLE', type: 'checkboxmodel', @@ -106,6 +108,22 @@ Ext.define('PVE.sdn.Fabric.InterfacePanel', { initComponent: function () { let me = this; + if (me.hasIpv6Support) { + me.commonColumns.push({ + text: gettext('IPv6'), + xtype: 'widgetcolumn', + dataIndex: 'ip6', + flex: 1, + widget: { + xtype: 'proxmoxtextfield', + isFormField: false, + bind: { + disabled: '{record.isDisabled}', + }, + }, + }); + } + Ext.apply(me, { store: Ext.create('Ext.data.Store', { model: 'Pve.sdn.Interface', diff --git a/www/manager6/sdn/fabrics/openfabric/InterfacePanel.js b/www/manager6/sdn/fabrics/openfabric/InterfacePanel.js index f23b889b4..19438bf5f 100644 --- a/www/manager6/sdn/fabrics/openfabric/InterfacePanel.js +++ b/www/manager6/sdn/fabrics/openfabric/InterfacePanel.js @@ -2,19 +2,6 @@ Ext.define('PVE.sdn.Fabric.OpenFabric.InterfacePanel', { extend: 'PVE.sdn.Fabric.InterfacePanel', additionalColumns: [ - { - text: gettext('IPv6'), - xtype: 'widgetcolumn', - dataIndex: 'ip6', - flex: 1, - widget: { - xtype: 'proxmoxtextfield', - isFormField: false, - bind: { - disabled: '{record.isDisabled}', - }, - }, - }, { text: gettext('Hello Multiplier'), xtype: 'widgetcolumn', diff --git a/www/manager6/sdn/fabrics/ospf/InterfacePanel.js b/www/manager6/sdn/fabrics/ospf/InterfacePanel.js index 29f0502fa..b521b1a22 100644 --- a/www/manager6/sdn/fabrics/ospf/InterfacePanel.js +++ b/www/manager6/sdn/fabrics/ospf/InterfacePanel.js @@ -1,3 +1,5 @@ Ext.define('PVE.sdn.Fabric.Ospf.InterfacePanel', { extend: 'PVE.sdn.Fabric.InterfacePanel', + + hasIpv6Support: false, }); -- 2.47.3