From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D277696AE9 for ; Tue, 16 Apr 2024 14:10:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B4DDA19271 for ; Tue, 16 Apr 2024 14:10:11 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 16 Apr 2024 14:10:10 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A93F145029 for ; Tue, 16 Apr 2024 14:10:09 +0200 (CEST) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 14:10:01 +0200 Message-Id: <20240416121002.135845-2-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240416121002.135845-1-f.schauer@proxmox.com> References: <20240416121002.135845-1-f.schauer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.074 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 Subject: [pve-devel] [PATCH v4 manager 1/2] utils: clarify naming of LXC mount point utils X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Apr 2024 12:10:11 -0000 Clarify the naming of mount point utils to clearly indicate their relation to LXC containers. Signed-off-by: Filip Schauer --- www/manager6/Utils.js | 12 ++++++------ www/manager6/lxc/MPEdit.js | 4 ++-- www/manager6/lxc/MultiMPEdit.js | 4 ++-- www/manager6/lxc/Resources.js | 2 +- www/manager6/window/GuestDiskReassign.js | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 287d651a..8205598a 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1590,13 +1590,13 @@ Ext.define('PVE.Utils', { } }, - mp_counts: { + lxc_mp_counts: { mp: 256, unused: 256, }, - forEachMP: function(func, includeUnused) { - for (let i = 0; i < PVE.Utils.mp_counts.mp; i++) { + forEachLxcMP: function(func, includeUnused) { + for (let i = 0; i < PVE.Utils.lxc_mp_counts.mp; i++) { let cont = func('mp', i); if (!cont && cont !== undefined) { return; @@ -1607,7 +1607,7 @@ Ext.define('PVE.Utils', { return; } - for (let i = 0; i < PVE.Utils.mp_counts.unused; i++) { + for (let i = 0; i < PVE.Utils.lxc_mp_counts.unused; i++) { let cont = func('unused', i); if (!cont && cont !== undefined) { return; @@ -1871,8 +1871,8 @@ Ext.define('PVE.Utils', { return undefined; }, - nextFreeMP: function(type, config) { - for (let i = 0; i < PVE.Utils.mp_counts[type]; i++) { + nextFreeLxcMP: function(type, config) { + for (let i = 0; i < PVE.Utils.lxc_mp_counts[type]; i++) { let confid = `${type}${i}`; if (!Ext.isDefined(config[confid])) { return { diff --git a/www/manager6/lxc/MPEdit.js b/www/manager6/lxc/MPEdit.js index 609447ef..1ea0f10e 100644 --- a/www/manager6/lxc/MPEdit.js +++ b/www/manager6/lxc/MPEdit.js @@ -87,7 +87,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', { let me = this; me.updateVMConfig(vmconfig); - PVE.Utils.forEachMP((bus, i) => { + PVE.Utils.forEachLxcMP((bus, i) => { let name = "mp" + i.toString(); if (!Ext.isDefined(vmconfig[name])) { me.down('field[name=mpid]').setValue(i); @@ -194,7 +194,7 @@ Ext.define('PVE.lxc.MountPointInputPanel', { name: 'mpid', fieldLabel: gettext('Mount Point ID'), minValue: 0, - maxValue: PVE.Utils.mp_counts.mp - 1, + maxValue: PVE.Utils.lxc_mp_counts.mp - 1, hidden: true, allowBlank: false, disabled: true, diff --git a/www/manager6/lxc/MultiMPEdit.js b/www/manager6/lxc/MultiMPEdit.js index 36cee4ff..d13dc81f 100644 --- a/www/manager6/lxc/MultiMPEdit.js +++ b/www/manager6/lxc/MultiMPEdit.js @@ -8,7 +8,7 @@ Ext.define('PVE.lxc.MultiMPPanel', { xclass: 'Ext.app.ViewController', // count of mps + rootfs - maxCount: PVE.Utils.mp_counts.mp + 1, + maxCount: PVE.Utils.lxc_mp_counts.mp + 1, getNextFreeDisk: function(vmconfig) { let nextFreeDisk; @@ -17,7 +17,7 @@ Ext.define('PVE.lxc.MultiMPPanel', { confid: 'rootfs', }; } else { - for (let i = 0; i < PVE.Utils.mp_counts.mp; i++) { + for (let i = 0; i < PVE.Utils.lxc_mp_counts.mp; i++) { let confid = `mp${i}`; if (!vmconfig[confid]) { nextFreeDisk = { diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js index 85112345..61182ef3 100644 --- a/www/manager6/lxc/Resources.js +++ b/www/manager6/lxc/Resources.js @@ -116,7 +116,7 @@ Ext.define('PVE.lxc.RessourceView', { }, }; - PVE.Utils.forEachMP(function(bus, i) { + PVE.Utils.forEachLxcMP(function(bus, i) { confid = bus + i; var group = 5; var header; diff --git a/www/manager6/window/GuestDiskReassign.js b/www/manager6/window/GuestDiskReassign.js index f6d08b32..405e7c9e 100644 --- a/www/manager6/window/GuestDiskReassign.js +++ b/www/manager6/window/GuestDiskReassign.js @@ -17,8 +17,8 @@ Ext.define('PVE.window.GuestDiskReassign', { }, formulas: { mpMaxCount: get => get('mpType') === 'mp' - ? PVE.Utils.mp_counts.mps - 1 - : PVE.Utils.mp_counts.unused - 1, + ? PVE.Utils.lxc_mp_counts.mps - 1 + : PVE.Utils.lxc_mp_counts.unused - 1, }, }, @@ -103,7 +103,7 @@ Ext.define('PVE.window.GuestDiskReassign', { view.VMConfig = result.data; mpIdSelector.setValue( - PVE.Utils.nextFreeMP( + PVE.Utils.nextFreeLxcMP( view.getViewModel().get('mpType'), view.VMConfig, ).id, -- 2.39.2