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 BCDF26C1B0 for ; Wed, 22 Sep 2021 11:27:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 52E5E17C0B for ; Wed, 22 Sep 2021 11:27:59 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 2794817BBC for ; Wed, 22 Sep 2021 11:27:57 +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 ABC4444A52 for ; Wed, 22 Sep 2021 11:27:50 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Wed, 22 Sep 2021 11:27:40 +0200 Message-Id: <20210922092749.2386238-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210922092749.2386238-1-d.csapak@proxmox.com> References: <20210922092749.2386238-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -1.234 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% ENA_SUBJ_ODD_CASE 3.2 Subject has odd case 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 manager v2 03/12] ui: refactor sortByPreviousUsage and nextFreeDisk 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: Wed, 22 Sep 2021 09:27:59 -0000 we'll use them outside of the controllerSelector soon Signed-off-by: Dominik Csapak --- www/manager6/Utils.js | 46 +++++++++++++++++++++++++ www/manager6/form/ControllerSelector.js | 45 +++++------------------- 2 files changed, 54 insertions(+), 37 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 4041c010..8631a67c 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1757,6 +1757,52 @@ Ext.define('PVE.Utils', { return true; }, + + sortByPreviousUsage: function(vmconfig, controllerList) { + if (!controllerList) { + controllerList = ['ide', 'virtio', 'scsi', 'sata']; + } + let usedControllers = {}; + for (const type of Object.keys(PVE.Utils.diskControllerMaxIDs)) { + usedControllers[type] = 0; + } + + for (const property of Object.keys(vmconfig)) { + if (property.match(PVE.Utils.bus_match) && !vmconfig[property].match(/media=cdrom/)) { + const foundController = property.match(PVE.Utils.bus_match)[1]; + usedControllers[foundController]++; + } + } + + let sortPriority = PVE.qemu.OSDefaults.getDefaults(vmconfig.ostype).busPriority; + + let sortedList = Ext.clone(controllerList); + sortedList.sort(function(a, b) { + if (usedControllers[b] === usedControllers[a]) { + return sortPriority[b] - sortPriority[a]; + } + return usedControllers[b] - usedControllers[a]; + }); + + return sortedList; + }, + + nextFreeDisk: function(controllers, config) { + for (const controller of controllers) { + for (let i = 0; i < PVE.Utils.diskControllerMaxIDs[controller]; i++) { + let confid = controller + i.toString(); + if (!Ext.isDefined(config[confid])) { + return { + controller, + id: i, + confid, + }; + } + } + } + + return undefined; + }, }, singleton: true, diff --git a/www/manager6/form/ControllerSelector.js b/www/manager6/form/ControllerSelector.js index 27c06169..fcf625a1 100644 --- a/www/manager6/form/ControllerSelector.js +++ b/www/manager6/form/ControllerSelector.js @@ -6,44 +6,15 @@ Ext.define('PVE.form.ControllerSelector', { vmconfig: {}, // used to check for existing devices - sortByPreviousUsage: function(vmconfig, controllerList) { - let usedControllers = {}; - for (const type of Object.keys(PVE.Utils.diskControllerMaxIDs)) { - usedControllers[type] = 0; - } - - for (const property of Object.keys(vmconfig)) { - if (property.match(PVE.Utils.bus_match) && !vmconfig[property].match(/media=cdrom/)) { - const foundController = property.match(PVE.Utils.bus_match)[1]; - usedControllers[foundController]++; - } - } - - let sortPriority = PVE.qemu.OSDefaults.getDefaults(vmconfig.ostype).busPriority; - - let sortedList = Ext.clone(controllerList); - sortedList.sort(function(a, b) { - if (usedControllers[b] === usedControllers[a]) { - return sortPriority[b] - sortPriority[a]; - } - return usedControllers[b] - usedControllers[a]; - }); - - return sortedList; - }, - setToFree: function(controllers, busField, deviceIDField) { let me = this; - for (const controller of controllers) { - busField.setValue(controller); - for (let i = 0; i < PVE.Utils.diskControllerMaxIDs[controller]; i++) { - let confid = controller + i.toString(); - if (!Ext.isDefined(me.vmconfig[confid])) { - deviceIDField.setValue(i); - return; - } - } + let freeId = PVE.Utils.nextFreeDisk(controllers, me.vmconfig); + + if (freeId !== undefined) { + busField.setValue(freeId.controller); + deviceIDField.setValue(freeId.id); } + }, setVMConfig: function(vmconfig, autoSelect) { @@ -54,7 +25,7 @@ Ext.define('PVE.form.ControllerSelector', { let bussel = me.down('field[name=controller]'); let deviceid = me.down('field[name=deviceid]'); - let clist = ['ide', 'virtio', 'scsi', 'sata']; + let clist; if (autoSelect === 'cdrom') { if (!Ext.isDefined(me.vmconfig.ide2)) { bussel.setValue('ide'); @@ -64,7 +35,7 @@ Ext.define('PVE.form.ControllerSelector', { clist = ['ide', 'scsi', 'sata']; } else { // in most cases we want to add a disk to the same controller we previously used - clist = me.sortByPreviousUsage(me.vmconfig, clist); + clist = PVE.Utils.sortByPreviousUsage(me.vmconfig); } me.setToFree(clist, bussel, deviceid); -- 2.30.2