Clarify the naming of mount point utils to clearly indicate their
relation to LXC containers.
Signed-off-by: Filip Schauer <f.scha...@proxmox.com>
---
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
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
