From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id A15AF1FF0E3 for ; Wed, 18 Nov 2026 21:44:46 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 3782821956; Wed, 18 Nov 2026 21:43:34 +0100 (CET) From: Thomas Lamprecht To: pve-devel@lists.proxmox.com Subject: [PATCH v2 manager 12/17] ui: storage: add NVMe over Fabrics storage Date: Wed, 18 Nov 2026 21:42:31 +0100 Message-ID: <20261118204302.3100813-13-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261118204302.3100813-1-t.lamprecht@proxmox.com> References: <20261118204302.3100813-1-t.lamprecht@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1795034587830 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.162 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: ZSII737NH2YSRM3PDYUCIXJ35FM5GNUH X-Message-ID-Hash: ZSII737NH2YSRM3PDYUCIXJ35FM5GNUH X-MailFrom: t.lamprecht@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: Show NVMe over Fabrics storages with their subsystem in the storage list, and add a dialog for them. The dialog lists the subsystems that a discovery portal reports and fills in the portals of the selected one, which can be changed. As in the iSCSI dialog, the discovery can run on another node, since the node serving the web UI may not be allowed on the array. The node of the discovery is then preselected as the node of the storage. The subsystem selector builds on the iSCSI target selector, which lets a subclass set its store fields and sort key. Signed-off-by: Thomas Lamprecht --- www/manager6/Makefile | 1 + www/manager6/Utils.js | 6 ++ www/manager6/dc/StorageView.js | 5 +- www/manager6/storage/IScsiEdit.js | 5 +- www/manager6/storage/NVMeOFEdit.js | 137 +++++++++++++++++++++++++++++ 5 files changed, 151 insertions(+), 3 deletions(-) create mode 100644 www/manager6/storage/NVMeOFEdit.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 1644e1d41..f8a1a2698 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -378,6 +378,7 @@ JSSRC= \ storage/LvmThinEdit.js \ storage/BTRFSEdit.js \ storage/NFSEdit.js \ + storage/NVMeOFEdit.js \ storage/PBSEdit.js \ storage/RBDEdit.js \ storage/StatusView.js \ diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 64269755d..ef8218918 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -886,6 +886,12 @@ Ext.define('PVE.Utils', { faIcon: 'building', backups: false, }, + nvmeof: { + name: 'NVMe over Fabrics', + ipanel: 'NVMeOFInputPanel', + faIcon: 'building', + backups: false, + }, cephfs: { name: 'CephFS', ipanel: 'CephFSInputPanel', diff --git a/www/manager6/dc/StorageView.js b/www/manager6/dc/StorageView.js index f0f298102..4d7e93dfd 100644 --- a/www/manager6/dc/StorageView.js +++ b/www/manager6/dc/StorageView.js @@ -247,7 +247,9 @@ Ext.define( sortable: true, dataIndex: 'path', renderer: function (value, metaData, record) { - return Ext.htmlEncode(record.data.target || value); + return Ext.htmlEncode( + record.data.target || record.data.subsysnqn || value, + ); }, }, { @@ -298,6 +300,7 @@ Ext.define( 'server', 'portal', 'target', + 'subsysnqn', 'export', 'storage', { name: 'shared', type: 'boolean' }, diff --git a/www/manager6/storage/IScsiEdit.js b/www/manager6/storage/IScsiEdit.js index c20aa2896..14f5d83f3 100644 --- a/www/manager6/storage/IScsiEdit.js +++ b/www/manager6/storage/IScsiEdit.js @@ -5,6 +5,7 @@ Ext.define('PVE.storage.IScsiScan', { queryParam: 'portal', valueField: 'target', displayField: 'target', + scanFields: ['target', 'portal'], matchFieldWidth: false, allowBlank: false, @@ -53,13 +54,13 @@ Ext.define('PVE.storage.IScsiScan', { } let store = Ext.create('Ext.data.Store', { - fields: ['target', 'portal'], + fields: me.scanFields, proxy: { type: 'proxmox', url: `${me.apiBaseUrl}${me.nodename}${me.apiSuffix}`, }, }); - store.sort('target', 'ASC'); + store.sort(me.valueField, 'ASC'); Ext.apply(me, { store: store, diff --git a/www/manager6/storage/NVMeOFEdit.js b/www/manager6/storage/NVMeOFEdit.js new file mode 100644 index 000000000..5d816cbbe --- /dev/null +++ b/www/manager6/storage/NVMeOFEdit.js @@ -0,0 +1,137 @@ +Ext.define('PVE.storage.NVMeOFScan', { + extend: 'PVE.storage.IScsiScan', + alias: 'widget.pveNVMeOFScan', + + valueField: 'subsysnqn', + displayField: 'subsysnqn', + scanFields: ['subsysnqn', 'portals'], + + listConfig: { + width: 650, + columns: [ + { + dataIndex: 'subsysnqn', + flex: 1, + renderer: Ext.htmlEncode, + }, + ], + emptyText: PVE.Utils.renderNotFound(gettext('Subsystem')), + }, + + config: { + apiSuffix: '/scan/nvmeof', + }, +}); + +Ext.define('PVE.storage.NVMeOFInputPanel', { + extend: 'PVE.panel.StorageBase', + mixins: ['Proxmox.Mixin.CBind'], + + onlineHelp: 'storage_nvmeof', + + namespaceContent: 'images', + + onGetValues: function (values) { + let me = this; + + values.content = values.namespaces ? me.namespaceContent : 'none'; + delete values.namespaces; + + return me.callParent([values]); + }, + + // a storage can be restricted to some volume types, keep its content types then + setValues: function (values) { + let me = this; + + values.namespaces = PVE.Utils.contentAllows(values.content, 'vm-vol'); + if (values.namespaces) { + me.namespaceContent = Ext.Array.from(values.content).join(','); + } + me.callParent([values]); + }, + + column1: [ + { + xtype: 'textfield', + name: 'discovery-portal', + fieldLabel: gettext('Discovery Portal'), + allowBlank: false, + submitValue: false, + cbind: { + hidden: '{!isCreate}', + disabled: '{!isCreate}', + }, + listeners: { + change: { + fn: function (field, value) { + let scan = this.up('inputpanel').lookup('subsystemScan'); + scan.setDisabled(!value); + scan.setPortal(value); + scan.setValue(''); + }, + buffer: 500, + }, + }, + }, + { + xtype: 'checkbox', + name: 'namespaces', + boxLabel: gettext('Use namespaces directly'), + }, + ], + + // NQNs and portal lists are longer than a column is wide + columnB: [ + { + cbind: { + xtype: (get) => (get('isCreate') ? 'pveNVMeOFScan' : 'displayfield'), + disabled: '{isCreate}', + }, + name: 'subsysnqn', + value: '', + fieldLabel: gettext('Subsystem'), + allowBlank: false, + reference: 'subsystemScan', + listeners: { + change: function (field, value) { + let rec = field + .getStore?.() + .findRecord('subsysnqn', value, 0, false, true, true); + if (rec) { + field + .up('inputpanel') + .down('field[name=portals]') + .setValue(rec.get('portals')); + } + }, + nodechanged: function (value) { + this.up('inputpanel').lookup('storageNodeRestriction').setValue(value); + }, + }, + }, + { + xtype: 'textfield', + name: 'portals', + fieldLabel: gettext('Portals'), + allowBlank: false, + }, + ], + + advancedColumn1: [ + { + xtype: 'proxmoxintegerfield', + name: 'fast-io-fail-tmo', + fieldLabel: gettext('Fail I/O After (s)'), + minValue: -1, + emptyText: '120', + cbind: { + deleteEmpty: '{!isCreate}', + }, + autoEl: { + tag: 'div', + 'data-qtip': gettext('Applies to newly connected paths. -1 disables the timeout.'), + }, + }, + ], +});