From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <n.ullreich@proxmox.com>
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 9DD5FA1CB8
for <pve-devel@lists.proxmox.com>; Fri, 16 Jun 2023 11:54:45 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 7F4DE3092E
for <pve-devel@lists.proxmox.com>; Fri, 16 Jun 2023 11:54:15 +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 <pve-devel@lists.proxmox.com>; Fri, 16 Jun 2023 11:54:14 +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 57B8945BD3
for <pve-devel@lists.proxmox.com>; Fri, 16 Jun 2023 11:54:14 +0200 (CEST)
From: Noel Ullreich <n.ullreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 16 Jun 2023 11:54:09 +0200
Message-Id: <20230616095410.33426-2-n.ullreich@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20230616095410.33426-1-n.ullreich@proxmox.com>
References: <20230616095410.33426-1-n.ullreich@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.053 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
T_SCC_BODY_TEXT_LINE -0.01 -
Subject: [pve-devel] [PATCH pve-manager 1/2] ui: fix #3760: change unit of
memory of a VM
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 16 Jun 2023 09:54:45 -0000
This patch adds a dropdown-menu (in the web interface) of units, MiB, GiB,
and TiB, (although PiB could easily be added in the future) for ram
and balloonsize of VMs.
Signed-off-by: Noel Ullreich <n.ullreich@proxmox.com>
---
www/manager6/qemu/MemoryEdit.js | 221 ++++++++++++++++++++++++--------
1 file changed, 168 insertions(+), 53 deletions(-)
diff --git a/www/manager6/qemu/MemoryEdit.js b/www/manager6/qemu/MemoryEdit.js
index 5e91dc9be..341f4611d 100644
--- a/www/manager6/qemu/MemoryEdit.js
+++ b/www/manager6/qemu/MemoryEdit.js
@@ -1,3 +1,9 @@
+let scalingFactor = [
+ { 'name': gettext('MiB'), 'factor': 1 },
+ { 'name': gettext('GiB'), 'factor': 1024 },
+ { 'name': gettext('TiB'), 'factor': 1024**2 },
+];
+
Ext.define('PVE.qemu.MemoryInputPanel', {
extend: 'Proxmox.panel.InputPanel',
alias: 'widget.pveQemuMemoryPanel',
@@ -23,26 +29,28 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
let memory = view.down('pveMemoryField[name=memory]');
// NOTE: we only set memory but that then sets balloon in its change handler
if (viewModel.get('current.ostype') === 'win11') {
- memory.setValue('4096');
+ memory.setValue(4);
} else {
- memory.setValue('2048');
+ memory.setValue(2);
}
+ memory.setMinValue(1);
+ memory.step=1;
}
},
},
onGetValues: function(values) {
- var me = this;
+ let me = this;
- var res = {};
+ let res = {};
- res.memory = values.memory;
- res.balloon = values.balloon;
+ res.memory = values.memory*values.memorySize;
+ res.balloon = values.balloon*values.balloonSize;
if (!values.ballooning) {
res.balloon = 0;
res.delete = 'shares';
- } else if (values.memory === values.balloon) {
+ } else if (res.memory===res.balloon) {
delete res.balloon;
res.delete = 'balloon,shares';
} else if (Ext.isDefined(values.shares) && values.shares !== "") {
@@ -54,53 +62,155 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
return res;
},
+ onSetValues: function(values) {
+ let me = this;
+ let res = structuredClone(values);
+
+ for (let i in scalingFactor) {
+ if (Object.prototype.hasOwnProperty.call(scalingFactor, i)) {
+ if (values.memory%scalingFactor[i].factor===0) {
+ res.memory = values.memory/scalingFactor[i].factor;
+ res.memorySize = scalingFactor[i];
+ }
+ if (values.balloon%scalingFactor[i].factor===0 && values.balloon) {
+ res.balloon = values.balloon/scalingFactor[i].factor;
+ res.balloonSize = scalingFactor[i];
+ }
+ }
+ }
+
+ return res;
+ },
+
initComponent: function() {
- var me = this;
- var labelWidth = 160;
+ let me = this;
+ let labelWidth = 160;
- me.items= [
+ me.items = [
{
- xtype: 'pveMemoryField',
+ xtype: 'fieldcontainer',
+ layout: 'hbox',
labelWidth: labelWidth,
- fieldLabel: gettext('Memory') + ' (MiB)',
- name: 'memory',
- value: '512', // better defaults get set via the view controllers afterrender
- minValue: 1,
- step: 32,
- hotplug: me.hotplug,
- listeners: {
- change: function(f, value, old) {
- var bf = me.down('field[name=balloon]');
- var balloon = bf.getValue();
- bf.setMaxValue(value);
- if (balloon === old) {
- bf.setValue(value);
- }
- bf.validate();
+ fieldLabel: gettext('Memory'),
+ items: [
+ {
+ xtype: 'pveMemoryField',
+ flex: 2,
+ name: 'memory',
+ value: 512, // better defaults get set via the view controllers afterrender
+ minValue: 16,
+ step: 32,
+ hotplug: me.hotplug,
+ listeners: {
+ change: function(f, value, old) {
+ let bf = me.down('field[name=balloon]');
+ let bsf = me.down('field[name=balloonSize]');
+ let msf = me.down('field[name=memorySize]');
+
+ let balloon = bf.getValue();
+ let balloonSize = bsf.getValue();
+ let memorySize = msf.getValue();
+
+ //max value is set based on which units are currently in use
+ bf.setMaxValue(value*memorySize/balloonSize);
+
+ if (balloon===old && memorySize===balloonSize) {
+ bf.setValue(value);
+ }
+ bf.validate();
+ },
+ },
},
- },
+ {
+ xtype: 'combobox',
+ name: 'memorySize',
+ itemId: 'memorySize',
+ value: me.insideWizard ? scalingFactor[1] : scalingFactor[0],
+ flex: 1,
+ editable: false,
+ allowBlank: false,
+ store: scalingFactor,
+ displayField: 'name',
+ valueField: 'factor',
+ listeners: {
+ change: function(f, value, old) {
+ let mf = me.down('field[name=memory]');
+ let bsf = me.down('field[name=balloonSize]');
+ let bf = me.down('field[name=balloon]');
+
+ let memory = mf.getValue();
+ let balloonSize = bsf.getValue();
+
+ if (value===1) {
+ mf.setMinValue(16);
+ mf.step=32;
+ } else {
+ mf.setMinValue(1);
+ mf.step=1;
+ }
+ bf.setMaxValue(memory*value/balloonSize);
+
+ mf.validate();
+ bf.validate();
+ },
+ },
+ },
+ ],
},
];
me.advancedItems= [
{
- xtype: 'pveMemoryField',
- name: 'balloon',
- minValue: 1,
- maxValue: me.insideWizard ? 2048 : 512,
- value: '512', // better defaults get set (indirectly) via the view controllers afterrender
- step: 32,
- fieldLabel: gettext('Minimum memory') + ' (MiB)',
- hotplug: me.hotplug,
+ xtype: 'fieldcontainer',
+ layout: 'hbox',
labelWidth: labelWidth,
- allowBlank: false,
- listeners: {
- change: function(f, value) {
- var memory = me.down('field[name=memory]').getValue();
- var shares = me.down('field[name=shares]');
- shares.setDisabled(value === memory);
+ fieldLabel: gettext('Minimum memory'),
+ items: [
+ {
+ xtype: 'pveMemoryField',
+ name: 'balloon',
+ flex: 2,
+ minValue: 1,
+ maxValue: me.insideWizard ? 2 : 512,
+ value: 512, // better defaults get set (indirectly) via the view controllers afterrender
+ step: 32,
+ hotplug: me.hotplug,
+ labelWidth: labelWidth,
+ allowBlank: false,
+ listeners: {
+ change: function(f, value) {
+ let memory = me.down('field[name=memory]').getValue();
+ let shares = me.down('field[name=shares]');
+ shares.setDisabled(value === memory);
+ },
+ },
},
- },
+ {
+ xtype: 'combobox',
+ name: 'balloonSize',
+ itemId: 'balloonSize',
+ value: me.insideWizard ? scalingFactor[1] : scalingFactor[0],
+ flex: 1,
+ editable: false,
+ allowBlank: false,
+ store: scalingFactor,
+ displayField: 'name',
+ valueField: 'factor',
+ listeners: {
+ change: function(f, value) {
+ let bf = me.down('field[name=balloon]');
+ let memorySize = me.down('field[name=memorySize]').getValue();
+ let memory = me.down('field[name=memory]').getValue();
+
+ bf.step = value===1 ? 32 : 1;
+
+ bf.setMaxValue(memory*memorySize/value);
+
+ bf.validate();
+ },
+ },
+ },
+ ],
},
{
xtype: 'proxmoxintegerfield',
@@ -124,10 +234,13 @@ Ext.define('PVE.qemu.MemoryInputPanel', {
fieldLabel: gettext('Ballooning Device'),
listeners: {
change: function(f, value) {
- var bf = me.down('field[name=balloon]');
- var shares = me.down('field[name=shares]');
- var memory = me.down('field[name=memory]');
+ let bf = me.down('field[name=balloon]');
+ let shares = me.down('field[name=shares]');
+ let memory = me.down('field[name=memory]');
+ let bsf = me.down('field[name=balloonSize]');
+
bf.setDisabled(!value);
+ bsf.setDisabled(!value);
shares.setDisabled(!value || bf.getValue() === memory.getValue());
},
},
@@ -149,9 +262,9 @@ Ext.define('PVE.qemu.MemoryEdit', {
extend: 'Proxmox.window.Edit',
initComponent: function() {
- var me = this;
+ let me = this;
- var memoryhotplug;
+ let memoryhotplug;
if (me.hotplug) {
Ext.each(me.hotplug.split(','), function(el) {
if (el === 'memory') {
@@ -160,7 +273,7 @@ Ext.define('PVE.qemu.MemoryEdit', {
});
}
- var ipanel = Ext.create('PVE.qemu.MemoryInputPanel', {
+ let ipanel = Ext.create('PVE.qemu.MemoryInputPanel', {
hotplug: memoryhotplug,
});
@@ -176,13 +289,15 @@ Ext.define('PVE.qemu.MemoryEdit', {
me.load({
success: function(response, options) {
- var data = response.result.data;
+ let data = response.result.data;
- var values = {
- ballooning: data.balloon === 0 ? '0' : '1',
+ let values = {
+ ballooning: data.balloon === 0 ? 0 : 1,
shares: data.shares,
- memory: data.memory || '512',
- balloon: data.balloon > 0 ? data.balloon : data.memory || '512',
+ memory: data.memory || 512,
+ memorySize: data.memorySize || scalingFactor[0],
+ balloon: data.balloon > 0 ? data.balloon : data.memory || 512,
+ balloonSize: data.balloonSize || scalingFactor[0],
};
ipanel.setValues(values);
--
2.30.2