From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 9C3E21FF0BC for ; Mon, 16 Nov 2026 17:14:44 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 88F2A21880; Mon, 16 Nov 2026 17:12:51 +0100 (CET) From: Gabriel Goller To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v3 27/32] ui: sdn: add VRF zone selection for fabrics Date: Mon, 16 Nov 2026 17:11:47 +0100 Message-ID: <20261116161154.343743-28-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261116161154.343743-1-g.goller@proxmox.com> References: <20261116161154.343743-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1794845521707 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.223 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: 5BGATZ733QNGLO4OHXMPEYTP7HMDXECT X-Message-ID-Hash: 5BGATZ733QNGLO4OHXMPEYTP7HMDXECT X-MailFrom: g.goller@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: Allow BGP and OSPF fabrics to select a simple zone with dedicated-vrf enabled for routing isolation. An empty selection uses the default VRF. Put the Dedicated VRF checkbox under Advanced in the simple zone editor. It is unchecked by default to preserve existing behavior. Signed-off-by: Gabriel Goller --- www/manager6/form/SDNZoneSelector.js | 16 +++++++++++++++- www/manager6/sdn/fabrics/FabricEdit.js | 15 +++++++++++++++ www/manager6/sdn/zones/SimpleEdit.js | 9 +++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/www/manager6/form/SDNZoneSelector.js b/www/manager6/form/SDNZoneSelector.js index d8a63baeb7bd..56206043271a 100644 --- a/www/manager6/form/SDNZoneSelector.js +++ b/www/manager6/form/SDNZoneSelector.js @@ -8,6 +8,9 @@ Ext.define( valueField: 'zone', displayField: 'zone', + // Only show simple zones which create a dedicated VRF. + vrfOnly: false, + initComponent: function () { var me = this; @@ -17,6 +20,13 @@ Ext.define( property: 'zone', direction: 'ASC', }, + filters: me.vrfOnly + ? [ + function (record) { + return record.get('type') === 'simple' && !record.get('default-vrf'); + }, + ] + : [], }); Ext.apply(me, { @@ -42,7 +52,11 @@ Ext.define( function () { Ext.define('pve-sdn-zone', { extend: 'Ext.data.Model', - fields: ['zone', 'type'], + fields: [ + 'zone', + 'type', + { name: 'dedicated-vrf', type: 'boolean', defaultValue: false }, + ], proxy: { type: 'proxmox', url: '/api2/json/cluster/sdn/zones', diff --git a/www/manager6/sdn/fabrics/FabricEdit.js b/www/manager6/sdn/fabrics/FabricEdit.js index e9e0d1fa6286..69a865ecd7df 100644 --- a/www/manager6/sdn/fabrics/FabricEdit.js +++ b/www/manager6/sdn/fabrics/FabricEdit.js @@ -37,6 +37,16 @@ Ext.define('PVE.sdn.Fabric.Fabric.Edit', { disabled: '{!isCreate}', }, }, + { + xtype: 'pveSDNZoneSelector', + fieldLabel: gettext('VRF Zone'), + labelWidth: 120, + name: 'zone', + vrfOnly: true, + allowBlank: true, + skipEmptyText: true, + emptyText: gettext('Default VRF'), + }, ], additionalItems: [], @@ -50,6 +60,11 @@ Ext.define('PVE.sdn.Fabric.Fabric.Edit', { me.autoLoad = !me.isCreate; me.method = me.isCreate ? 'POST' : 'PUT'; + let supportsVrf = ['bgp', 'ospf'].includes(me.extraRequestParams.protocol); + let vrfZoneField = me.items.find((item) => item.name === 'zone'); + vrfZoneField.hidden = !supportsVrf; + vrfZoneField.disabled = !supportsVrf || !me.isCreate; + if (!me.isCreate) { me.url = `${me.baseUrl}/${me.fabricId}`; } else { diff --git a/www/manager6/sdn/zones/SimpleEdit.js b/www/manager6/sdn/zones/SimpleEdit.js index ba10bb3616ea..9c88668bb5d6 100644 --- a/www/manager6/sdn/zones/SimpleEdit.js +++ b/www/manager6/sdn/zones/SimpleEdit.js @@ -20,6 +20,15 @@ Ext.define('PVE.sdn.zones.SimpleInputPanel', { me.items = []; me.advancedItems = [ + { + xtype: 'proxmoxcheckbox', + name: 'dedicated-vrf', + fieldLabel: gettext('Dedicated VRF'), + checked: false, + uncheckedValue: 0, + defaultValue: 0, + deleteDefaultValue: !me.isCreate, + }, { xtype: 'proxmoxcheckbox', name: 'dhcp', -- 2.47.3