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 0D9831FF0B7 for ; Fri, 13 Nov 2026 04:32:23 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id C0B3421C97; Fri, 13 Nov 2026 04:22:15 +0100 (CET) From: Thomas Lamprecht To: pve-devel@lists.proxmox.com Subject: [PATCH manager 14/17] ui: dc: san: add a guided setup for shared LVM on NVMe over Fabrics Date: Fri, 13 Nov 2026 04:04:42 +0100 Message-ID: <20261113030541.1591528-15-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261113030541.1591528-1-t.lamprecht@proxmox.com> References: <20261113030541.1591528-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: 1794539148783 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.184 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) PROLO_LEO2 0.1 Meta Catches all Leo drug variations so far 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: G45MLUV2GCU4EAZVIC5A5OD23L6K546X X-Message-ID-Hash: G45MLUV2GCU4EAZVIC5A5OD23L6K546X 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: Add an NVMe over Fabrics entry to the guided setup of the SAN view, with the same steps as for iSCSI: connect to the subsystem found at a discovery portal, with the host NQNs of all nodes at hand for the access rules of the array, select a namespace, name the volume group and storage, and confirm. The target step is shared with iSCSI, as only the storage type, its scan and the node identities differ. The add dialog of NVMe over Fabrics storages names the SAN view, as those of iSCSI and LVM do. Signed-off-by: Thomas Lamprecht --- www/manager6/Makefile | 2 +- www/manager6/SANUtils.js | 2 + www/manager6/dc/SAN.js | 2 +- www/manager6/storage/NVMeOFEdit.js | 3 + www/manager6/storage/wizard/LunSelect.js | 29 +++- www/manager6/storage/wizard/NodeIdentities.js | 45 +++--- .../storage/wizard/{IScsi.js => Target.js} | 129 ++++++++++++------ www/manager6/storage/wizard/Wizard.js | 43 +++--- www/manager6/window/SANLunState.js | 23 +++- 9 files changed, 183 insertions(+), 95 deletions(-) rename www/manager6/storage/wizard/{IScsi.js => Target.js} (64%) diff --git a/www/manager6/Makefile b/www/manager6/Makefile index fbd866b4b..ab4b85d0c 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -389,7 +389,7 @@ JSSRC= \ storage/wizard/Wizard.js \ storage/wizard/LunSelect.js \ storage/wizard/NodeIdentities.js \ - storage/wizard/IScsi.js \ + storage/wizard/Target.js \ storage/wizard/FibreChannel.js \ Workspace.js \ # end of JSSRC list diff --git a/www/manager6/SANUtils.js b/www/manager6/SANUtils.js index c08ac2a1a..d61c74df4 100644 --- a/www/manager6/SANUtils.js +++ b/www/manager6/SANUtils.js @@ -23,6 +23,8 @@ Ext.define('pve-san-lun', { 'multipath-storage', 'iscsi-target', 'iscsi-lun', + 'nvme-subsystem', + 'nvme-nsid', ], }); diff --git a/www/manager6/dc/SAN.js b/www/manager6/dc/SAN.js index 6b32926c7..21f79272a 100644 --- a/www/manager6/dc/SAN.js +++ b/www/manager6/dc/SAN.js @@ -120,7 +120,7 @@ Ext.define('PVE.dc.SANView', { { text: gettext('Add Storage'), disabled: !allCaps.storage['Datastore.Allocate'], - menu: [setupItem('iscsi'), setupItem('fc', !canModify)], + menu: [setupItem('iscsi'), setupItem('fc', !canModify), setupItem('nvmeof')], }, ]; me.items = [ diff --git a/www/manager6/storage/NVMeOFEdit.js b/www/manager6/storage/NVMeOFEdit.js index 92057dc4f..b23b828bc 100644 --- a/www/manager6/storage/NVMeOFEdit.js +++ b/www/manager6/storage/NVMeOFEdit.js @@ -30,6 +30,9 @@ Ext.define('PVE.storage.NVMeOFInputPanel', { onlineHelp: 'storage_nvmeof', + // TRANSLATORS: "Add Storage" is a button of the SAN view, {0} the menu path of that view. + sanNote: gettext('To set up shared LVM on a namespace, use Add Storage in {0}.'), + onGetValues: function (values) { let me = this; diff --git a/www/manager6/storage/wizard/LunSelect.js b/www/manager6/storage/wizard/LunSelect.js index a34b95d29..18572015c 100644 --- a/www/manager6/storage/wizard/LunSelect.js +++ b/www/manager6/storage/wizard/LunSelect.js @@ -27,7 +27,11 @@ Ext.define('PVE.storage.wizard.LunSelect', { return; } me.store.setFilters([ - { property: 'iscsi-target', value: wizard.connection.target, exactMatch: true }, + { + property: wizard.wizardType === 'nvmeof' ? 'nvme-subsystem' : 'iscsi-target', + value: wizard.connection.target, + exactMatch: true, + }, ]); Proxmox.Utils.API2Request({ url: `/nodes/${Proxmox.NodeName}/storage/${encodeURIComponent(wizard.connection.storage)}/content`, @@ -67,9 +71,13 @@ Ext.define('PVE.storage.wizard.LunSelect', { xtype: 'component', cls: 'pmx-hint', margin: '0 0 10 0', - html: gettext( - 'A LUN used by a storage cannot be selected. A LUN with other data has to be wiped under Node > SAN first.', - ), + html: me.nvme + ? gettext( + 'A namespace used by a storage cannot be selected. A namespace with other data has to be wiped under Node > SAN first.', + ) + : gettext( + 'A LUN used by a storage cannot be selected. A LUN with other data has to be wiped under Node > SAN first.', + ), }, ...(me.rescanNote ? [ @@ -84,7 +92,9 @@ Ext.define('PVE.storage.wizard.LunSelect', { xtype: 'grid', flex: 1, store: me.store, - emptyText: gettext('No LUNs found. Check connections and array access.'), + emptyText: me.nvme + ? gettext('No namespaces found. Check connections and array access.') + : gettext('No LUNs found. Check connections and array access.'), viewConfig: { enableTextSelection: true, getRowClass: (rec) => (rec.get('used-by-storage') ? 'x-item-disabled' : ''), @@ -102,6 +112,7 @@ Ext.define('PVE.storage.wizard.LunSelect', { renderer: (value, md, rec) => Ext.htmlEncode(value || rec.get('wwid')), }, { text: 'LUN', dataIndex: 'iscsi-lun', width: 60 }, + { text: 'NSID', dataIndex: 'nvme-nsid', width: 60 }, { text: gettext('Model'), dataIndex: 'model', @@ -122,6 +133,8 @@ Ext.define('PVE.storage.wizard.LunSelect', { text: gettext('Multipath'), dataIndex: 'multipath', width: 170, + // native NVMe multipath needs no setup per namespace + hidden: me.nvme, renderer: PVE.SANUtils.renderSanLunMultipath, }, { @@ -162,8 +175,10 @@ Ext.define('PVE.storage.wizard.LunSelect', { Proxmox.Utils.monStoreErrors(me.down('grid'), me.rstore); me.mon(me.rstore, 'load', updateSelection); me.on('activate', function () { - if (me.up('window').wizardType === 'fc') { - me.down('gridcolumn[dataIndex=iscsi-lun]').hide(); + let type = me.up('window').wizardType; + me.down('gridcolumn[dataIndex=iscsi-lun]').setHidden(type !== 'iscsi'); + me.down('gridcolumn[dataIndex=nvme-nsid]').setHidden(type !== 'nvmeof'); + if (type === 'fc') { me.store.setFilters([ { filterFn: (rec) => ['fc', 'fcoe', 'nvme-fc'].includes(rec.get('transport')), diff --git a/www/manager6/storage/wizard/NodeIdentities.js b/www/manager6/storage/wizard/NodeIdentities.js index 9c7ab8cce..69c7fbca2 100644 --- a/www/manager6/storage/wizard/NodeIdentities.js +++ b/www/manager6/storage/wizard/NodeIdentities.js @@ -1,7 +1,7 @@ Ext.define('pve-san-node-identity', { extend: 'Ext.data.Model', idProperty: 'node', - fields: ['node', 'state', 'iscsi-initiator-name'], + fields: ['node', 'state', 'iscsi-initiator-name', 'nvme-host-nqn'], }); Ext.define('PVE.storage.wizard.NodeIdentities', { @@ -10,24 +10,29 @@ Ext.define('PVE.storage.wizard.NodeIdentities', { height: 220, disableSelection: true, viewConfig: { enableTextSelection: true }, - columns: [ - { text: gettext('Node'), dataIndex: 'node', width: 100, renderer: Ext.htmlEncode }, - { - text: gettext('State'), - dataIndex: 'state', - width: 175, - renderer: PVE.SANUtils.renderState, - }, - { - text: gettext('Initiator Name'), - dataIndex: 'iscsi-initiator-name', - flex: 1, - renderer: Ext.htmlEncode, - }, - ], + + identity: 'iscsi-initiator-name', initComponent: function () { let me = this; + let nvme = me.identity === 'nvme-host-nqn'; + me.columns = [ + { text: gettext('Node'), dataIndex: 'node', width: 100, renderer: Ext.htmlEncode }, + { + text: gettext('State'), + dataIndex: 'state', + width: 175, + renderer: PVE.SANUtils.renderState, + // the state of multipathd, which NVMe does not use + hidden: nvme, + }, + { + text: nvme ? gettext('Host NQN') : gettext('Initiator Name'), + dataIndex: me.identity, + flex: 1, + renderer: Ext.htmlEncode, + }, + ]; me.rstore = Ext.create('Proxmox.data.UpdateStore', { storeid: 'san-wizard-identities', model: 'pve-san-node-identity', @@ -56,17 +61,19 @@ Ext.define('PVE.storage.wizard.NodeIdentities', { me.tbar = [ { xtype: 'tbtext', - text: gettext('Allow these initiator names on the target.'), + text: nvme + ? gettext('Allow these host NQNs on the target.') + : gettext('Allow these initiator names on the target.'), }, '->', { - text: gettext('Copy Initiator Names'), + text: nvme ? gettext('Copy Host NQNs') : gettext('Copy Initiator Names'), iconCls: 'fa fa-clipboard', handler: () => PVE.Utils.copyToClipboard( me.store .getRange() - .map((rec) => rec.get('iscsi-initiator-name')) + .map((rec) => rec.get(me.identity)) .filter(Boolean) .join('\n'), ), diff --git a/www/manager6/storage/wizard/IScsi.js b/www/manager6/storage/wizard/Target.js similarity index 64% rename from www/manager6/storage/wizard/IScsi.js rename to www/manager6/storage/wizard/Target.js index 515d1206f..e505ddca0 100644 --- a/www/manager6/storage/wizard/IScsi.js +++ b/www/manager6/storage/wizard/Target.js @@ -1,13 +1,14 @@ -Ext.define('PVE.storage.wizard.IScsiTarget', { +Ext.define('PVE.storage.wizard.Target', { extend: 'Proxmox.panel.InputPanel', - xtype: 'pveStorageWizardIScsiTarget', - onlineHelp: 'storage_open_iscsi', + xtype: 'pveStorageWizardTarget', + + storageType: 'iscsi', updateConnectionField: function () { let me = this; let target = me.down('field[name=target]').getValue(); let storage = me.storages?.find( - (entry) => entry.type === 'iscsi' && entry.target === target, + (entry) => entry.type === me.storageType && entry[me.targetKey] === target, ); let field = me.down('field[name=connection]'); if (storage) { @@ -20,16 +21,16 @@ Ext.define('PVE.storage.wizard.IScsiTarget', { onSubmit: function () { let me = this; + let nvme = me.storageType === 'nvmeof'; let wizard = me.up('window'); let values = me.getValues(); - let params = { - type: 'iscsi', - storage: values.connection, - portal: values.portal, - target: values.target, - content: 'none', - multipath: 1, - }; + let params = { type: me.storageType, storage: values.connection, content: 'none' }; + if (nvme) { + params.subsysnqn = values.target; + params['nvme-portals'] = values['nvme-portals']; + } else { + Object.assign(params, { portal: values.portal, target: values.target, multipath: 1 }); + } let nodes = [] .concat(values.nodes || []) .filter(Boolean) @@ -59,18 +60,22 @@ Ext.define('PVE.storage.wizard.IScsiTarget', { } me.storages = response.result.data; me.updateConnectionField(); - let users = me.storages.filter((entry) => entry.target === values.target); + let users = me.storages.filter((entry) => entry[me.targetKey] === values.target); if (users.length) { let base = users[0]; if ( users.length !== 1 || - base.type !== 'iscsi' || + base.type !== me.storageType || `${base.content ?? ''}` !== 'none' ) { wizard.showError( - gettext( - 'This target is already used by another storage. Check Datacenter > Storage.', - ), + nvme + ? gettext( + 'This subsystem is already used by another storage. Check Datacenter > Storage.', + ) + : gettext( + 'This target is already used by another storage. Check Datacenter > Storage.', + ), ); return; } @@ -78,9 +83,13 @@ Ext.define('PVE.storage.wizard.IScsiTarget', { wizard.showError( Ext.htmlEncode( Ext.String.format( - gettext( - 'Storage "{0}" connects to this target, but it is disabled. Enable that storage first.', - ), + nvme + ? gettext( + 'Storage "{0}" connects to this subsystem, but it is disabled. Enable that storage first.', + ) + : gettext( + 'Storage "{0}" connects to this target, but it is disabled. Enable that storage first.', + ), base.storage, ), ), @@ -116,10 +125,10 @@ Ext.define('PVE.storage.wizard.IScsiTarget', { } let connection = { storage: base.storage, - target: base.target, + target: values.target, nodes: selectedNodes.join(','), }; - if (!base.multipath) { + if (!nvme && !base.multipath) { wizard.showError( Ext.htmlEncode( Ext.String.format( @@ -142,7 +151,7 @@ Ext.define('PVE.storage.wizard.IScsiTarget', { waitMsgTarget: wizard, failure: fail, success: () => - connected({ storage: params.storage, target: params.target, nodes }), + connected({ storage: params.storage, target: values.target, nodes }), }); }, }); @@ -150,6 +159,10 @@ Ext.define('PVE.storage.wizard.IScsiTarget', { initComponent: function () { let me = this; + let nvme = me.storageType === 'nvmeof'; + me.targetKey = nvme ? 'subsysnqn' : 'target'; + me.onlineHelp = nvme ? 'storage_nvmeof' : 'storage_open_iscsi'; + let targetLabel = nvme ? gettext('Subsystem') : gettext('Target'); let common = PVE.panel.StorageBase.commonFields(true); // wide enough for the longest label of the step let labelWidth = 150; @@ -157,7 +170,7 @@ Ext.define('PVE.storage.wizard.IScsiTarget', { { xtype: 'textfield', name: 'portal', - fieldLabel: 'Portal', + fieldLabel: nvme ? gettext('Discovery Portal') : 'Portal', labelWidth, allowBlank: false, listeners: { @@ -173,33 +186,54 @@ Ext.define('PVE.storage.wizard.IScsiTarget', { }, }, { - xtype: 'pveIScsiScan', + xtype: nvme ? 'pveNVMeOFScan' : 'pveIScsiScan', name: 'target', - fieldLabel: gettext('Target'), + fieldLabel: targetLabel, labelWidth, disabled: true, showNodeSelector: false, nodename: Proxmox.NodeName, - listeners: { change: () => me.updateConnectionField() }, + listeners: { + change: function (field, value) { + me.updateConnectionField(); + let rec = nvme + ? field.getStore().findRecord('subsysnqn', value, 0, false, true, true) + : undefined; + if (rec) { + me.down('field[name=nvme-portals]').setValue(rec.get('portals')); + } + }, + }, listConfig: { width: 650, - emptyText: PVE.Utils.renderNotFound(gettext('iSCSI Target')), + emptyText: PVE.Utils.renderNotFound(targetLabel), columns: [ { - text: gettext('Target'), - dataIndex: 'target', + text: targetLabel, + dataIndex: me.targetKey, flex: 1, renderer: Ext.htmlEncode, }, { text: gettext('Portals'), - dataIndex: 'portal', + dataIndex: nvme ? 'portals' : 'portal', width: 220, renderer: Ext.htmlEncode, }, ], }, }, + ...(nvme + ? [ + { + xtype: 'textfield', + name: 'nvme-portals', + fieldLabel: gettext('Portals'), + labelWidth, + allowBlank: false, + }, + ] + : []), { ...common.id, name: 'connection', @@ -210,12 +244,19 @@ Ext.define('PVE.storage.wizard.IScsiTarget', { xtype: 'component', margin: '0 0 10 0', html: `${Ext.htmlEncode(gettext('Note:'))} ${Ext.htmlEncode( - gettext( - 'Next creates or reuses the connection storage before you select a LUN.', - ), + nvme + ? gettext( + 'Next creates or reuses the connection storage before you select a namespace.', + ) + : gettext( + 'Next creates or reuses the connection storage before you select a LUN.', + ), )}`, }, - { xtype: 'pveStorageWizardNodeIdentities' }, + { + xtype: 'pveStorageWizardNodeIdentities', + identity: nvme ? 'nvme-host-nqn' : 'iscsi-initiator-name', + }, ]; me.advancedItems = [ { ...common.nodes, labelWidth, validator: PVE.storage.wizard.validateNodes }, @@ -242,8 +283,10 @@ Ext.define('PVE.storage.wizard.IScsiTarget', { }, }); -PVE.storage.wizard.createIScsiLVM = function (wizard, values, lun) { +PVE.storage.wizard.createLVMOnBase = function (wizard, values, lun) { let connection = wizard.connection; + let suffix = + wizard.wizardType === 'nvmeof' ? `:nvme-${lun.wwid}` : `.dm-uuid-mpath-${lun.wwid}`; let fail = (response) => wizard.showError(response.htmlStatus); Proxmox.Utils.API2Request({ url: `/nodes/${Proxmox.NodeName}/storage/${encodeURIComponent(connection.storage)}/content`, @@ -255,14 +298,16 @@ PVE.storage.wizard.createIScsiLVM = function (wizard, values, lun) { if (wizard.destroyed) { return; } - let volume = response.result.data.find((entry) => - entry.volid.endsWith(`.dm-uuid-mpath-${lun.wwid}`), - ); + let volume = response.result.data.find((entry) => entry.volid.endsWith(suffix)); if (!volume) { wizard.showError( - gettext( - 'The selected LUN has no multipath volume yet. Check Node > SAN, then retry.', - ), + wizard.wizardType === 'nvmeof' + ? gettext( + 'The selected namespace is not available yet. Check Node > SAN, then retry.', + ) + : gettext( + 'The selected LUN has no multipath volume yet. Check Node > SAN, then retry.', + ), ); return; } diff --git a/www/manager6/storage/wizard/Wizard.js b/www/manager6/storage/wizard/Wizard.js index 9d4e6a256..2739cdeb3 100644 --- a/www/manager6/storage/wizard/Wizard.js +++ b/www/manager6/storage/wizard/Wizard.js @@ -92,6 +92,7 @@ Ext.define('PVE.storage.wizard.SAN', { wwid, storage: values.storage, fc: me.wizardType === 'fc', + nvme: me.wizardType === 'nvmeof', autoShow: true, }); }, @@ -100,6 +101,9 @@ Ext.define('PVE.storage.wizard.SAN', { multipathSummary: function (lun) { let me = this; + if (me.wizardType === 'nvmeof') { + return PVE.SANUtils.multipathText('native'); + } // an explicit entry configures the map, also of a LUN of the connection storage if (lun.multipath === 'manual') { return PVE.SANUtils.multipathText('manual'); @@ -145,24 +149,25 @@ Ext.define('PVE.storage.wizard.SAN', { if (me.wizardType === 'fc') { PVE.storage.wizard.createFC(me, values, lun); } else { - PVE.storage.wizard.createIScsiLVM(me, values, lun); + PVE.storage.wizard.createLVMOnBase(me, values, lun); } }, initComponent: function () { let me = this; - if (!['iscsi', 'fc'].includes(me.wizardType)) { + if (!['iscsi', 'fc', 'nvmeof'].includes(me.wizardType)) { throw 'no SAN storage type specified'; } - let iscsi = me.wizardType === 'iscsi'; + let fc = me.wizardType === 'fc'; me.subject = PVE.storage.wizard.subject(me.wizardType); me.title = Proxmox.Utils.dialog_title(me.subject, true, true); + let onlineHelp = me.wizardType === 'nvmeof' ? 'storage_nvmeof' : 'storage_multipath'; let common = PVE.panel.StorageBase.commonFields(true); let snapshots = PVE.panel.StorageBase.volumeChainFields(true, 'lvm'); let settings = { xtype: 'inputpanel', title: gettext('Volume Group'), - onlineHelp: 'storage_multipath', + onlineHelp, items: [ { ...common.id, fieldLabel: gettext('Storage ID') }, { @@ -176,35 +181,37 @@ Ext.define('PVE.storage.wizard.SAN', { snapshots.hint, ], }; - if (!iscsi) { + if (fc) { settings.advancedItems = [ { ...common.nodes, validator: PVE.storage.wizard.validateNodes }, ]; } me.items = [ - ...(iscsi - ? [ + ...(fc + ? [] + : [ { - xtype: 'pveStorageWizardIScsiTarget', + xtype: 'pveStorageWizardTarget', title: gettext('Target'), itemId: 'target', + storageType: me.wizardType, }, - ] - : []), + ]), { xtype: 'pveStorageWizardLunSelect', - title: 'LUN', + title: me.wizardType === 'nvmeof' ? gettext('Namespace') : 'LUN', itemId: 'luns', - onlineHelp: 'storage_multipath', + nvme: me.wizardType === 'nvmeof', + onlineHelp, // the nodes only see a newly mapped Fibre Channel LUN after a rescan - rescanNote: iscsi - ? undefined - : Ext.String.format( + rescanNote: fc + ? Ext.String.format( gettext( 'After mapping a new LUN on the array, rescan the Fibre Channel hosts of each node (documentation).', ), Ext.htmlEncode(Proxmox.Utils.get_help_link('storage_multipath')), - ), + ) + : undefined, }, settings, { @@ -239,14 +246,14 @@ Ext.define('PVE.storage.wizard.SAN', { me.callParent(); let tabs = me.down('#wizcontent'); tabs.on('tabchange', function (tp, tab) { - if (iscsi && tab === me.down('#luns')) { + if (!fc && tab === me.down('#luns')) { me.down('#back').disable(); } me.down('#submit').setText( tab === me.down('#target') ? gettext('Next') : gettext('Finish'), ); }); - if (iscsi) { + if (!fc) { me.down('#submit').setText(gettext('Next')); } me.on('destroy', () => me.reloadCallback?.()); diff --git a/www/manager6/window/SANLunState.js b/www/manager6/window/SANLunState.js index a0a6d514d..1de84ea2b 100644 --- a/www/manager6/window/SANLunState.js +++ b/www/manager6/window/SANLunState.js @@ -19,7 +19,10 @@ Ext.define('PVE.window.SANLunState', { if (!me.wwid || !me.storage) { throw 'no LUN or storage specified'; } - me.title = Ext.String.format(gettext('Storage {0}: LUN State'), me.storage); + me.title = Ext.String.format( + me.nvme ? gettext('Storage {0}: Namespace State') : gettext('Storage {0}: LUN State'), + me.storage, + ); // The other nodes set up a new LUN with their next status updates. let pendingUntil = Date.now() + 60000; let rstore = Ext.create('Proxmox.data.UpdateStore', { @@ -51,13 +54,17 @@ Ext.define('PVE.window.SANLunState', { margin: '0 0 10 0', html: Ext.htmlEncode( Ext.String.format( - me.fc + me.nvme ? gettext( - 'Storage "{0}" was added. Guests on this storage cannot run on a node that stays on "Missing": check its access to the LUN on the array and rescan its Fibre Channel hosts.', + 'Storage "{0}" was added. Guests on this storage cannot run on a node that stays on "Missing": check its access to the namespace on the array.', ) - : gettext( - 'Storage "{0}" was added. Guests on this storage cannot run on a node that stays on "Missing": check its access to the LUN on the array.', - ), + : me.fc + ? gettext( + 'Storage "{0}" was added. Guests on this storage cannot run on a node that stays on "Missing": check its access to the LUN on the array and rescan its Fibre Channel hosts.', + ) + : gettext( + 'Storage "{0}" was added. Guests on this storage cannot run on a node that stays on "Missing": check its access to the LUN on the array.', + ), me.storage, ), ), @@ -67,7 +74,9 @@ Ext.define('PVE.window.SANLunState', { flex: 1, store, disableSelection: true, - emptyText: gettext('No node reported this LUN yet.'), + emptyText: me.nvme + ? gettext('No node reported this namespace yet.') + : gettext('No node reported this LUN yet.'), columns: [ { text: gettext('Node'),