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 CF98EAED0 for ; Wed, 6 Apr 2022 10:04:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 66DBF2734C for ; Wed, 6 Apr 2022 10:04:46 +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 id 4D4B227180 for ; Wed, 6 Apr 2022 10:04:39 +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 1A07841FC3 for ; Wed, 6 Apr 2022 10:04:39 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 6 Apr 2022 10:04:03 +0200 Message-Id: <20220406080416.66227-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220406080416.66227-1-f.ebner@proxmox.com> References: <20220406080416.66227-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.110 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 v10 manager 06/19] ui: HD edit: allow selecting import source 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, 06 Apr 2022 08:04:47 -0000 The backend now supports importing from an existing volume, or, for root, from an arbitrary file system path. This is also in preparation for import from OVF functionality in the VM create wizard. Co-developed-by: Dominic Jäger Signed-off-by: Fabian Ebner --- www/manager6/qemu/HDEdit.js | 116 +++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 1 deletion(-) diff --git a/www/manager6/qemu/HDEdit.js b/www/manager6/qemu/HDEdit.js index 92e6d116..3edc077d 100644 --- a/www/manager6/qemu/HDEdit.js +++ b/www/manager6/qemu/HDEdit.js @@ -75,10 +75,19 @@ Ext.define('PVE.qemu.HDInputPanel', { me.drive.file = me.vmconfig[values.unusedId]; confid = values.controller + values.deviceid; } else if (me.isCreate) { + let diskSource = values[`diskSource-${me.id}`]; if (values.hdimage) { me.drive.file = values.hdimage; - } else { + } else if (diskSource === 'empty') { me.drive.file = values.hdstorage + ":" + values.disksize; + } else if (diskSource === 'volume') { + me.drive.file = `${values.hdstorage}:0`; + me.drive['import-from'] = `${values.sourceImage}`; + } else if (diskSource === 'path') { + me.drive.file = `${values.hdstorage}:0`; + me.drive['import-from'] = `${values.sourcePath}`; + } else { + throw "internal error - unexcpected disk source!"; } me.drive.format = values.diskformat; } @@ -168,6 +177,7 @@ Ext.define('PVE.qemu.HDInputPanel', { var me = this; me.down('#hdstorage').setNodename(nodename); me.down('#hdimage').setStorage(undefined, nodename); + me.down('#sourceStorage').setNodename(nodename); }, initComponent: function() { @@ -244,6 +254,110 @@ Ext.define('PVE.qemu.HDInputPanel', { reference: 'discard', name: 'discard', }, + { + xtype: 'radiofield', + name: `diskSource-${me.id}`, // needs to be unique when used in MultiDiskPanel + inputValue: 'empty', + boxLabel: gettext('Create empty disk'), + hidden: !me.isCreate || me.unused, + checked: true, + listeners: { + change: function(field, nowSelected) { + if (nowSelected) { + me.down('pveDiskStorageSelector').setSize(); // reset + } + }, + }, + }, + { + xtype: 'radiofield', + name: `diskSource-${me.id}`, + inputValue: 'volume', + boxLabel: gettext('Import from existing volume'), + hidden: !me.isCreate || me.unused, + listeners: { + change: (field, nowSelected) => { + let sourceImageSelector = me.down('#sourceImage'); + let sourceStorageSelector = me.down('#sourceStorage'); + if (nowSelected) { + me.down('pveDiskStorageSelector').setSize( + sourceImageSelector.getCurrentSize(), + true, + ); + } + + sourceStorageSelector.setHidden(!nowSelected); + sourceStorageSelector.setDisabled(!nowSelected); + sourceStorageSelector.fireEvent('validitychange'); + sourceImageSelector.setHidden(!nowSelected); + sourceImageSelector.setDisabled(!nowSelected); + sourceImageSelector.fireEvent('validitychange'); + }, + }, + }, + { + xtype: 'pveStorageSelector', + itemId: 'sourceStorage', + name: 'sourceStorage', + nodename: me.nodename, + fieldLabel: gettext('Storage'), + storageContent: 'images', + autoSelect: me.insideWizard, + hidden: true, + disabled: true, + listeners: { + change: function(selector, selectedStorage) { + selector.next('pveFileSelector').setStorage( + selectedStorage, + me.getViewModel().get('nodename'), + ); + }, + }, + }, + { + xtype: 'pveFileSelector', + itemId: 'sourceImage', + name: 'sourceImage', + nodename: me.nodename, + storageContent: 'images', + hidden: true, + disabled: true, + fieldLabel: gettext('Image'), + listeners: { + change: function(field, value) { + if (!field.isDisabled()) { + me.down('pveDiskStorageSelector').setSize(this.getCurrentSize(), true); + } + }, + }, + }, + { + xtype: 'radiofield', + name: `diskSource-${me.id}`, + inputValue: 'path', + boxLabel: gettext('Import from existing volume by path'), + hidden: !me.isCreate || me.unused || Proxmox.UserName !== 'root@pam', + listeners: { + change: (field, nowSelected) => { + let sourcePathField = me.down('#sourcePath'); + sourcePathField.setHidden(!nowSelected); + sourcePathField.setDisabled(!nowSelected); + sourcePathField.fireEvent('validitychange'); + + if (nowSelected) { + me.down('pveDiskStorageSelector').setSize(0, true); + } + }, + }, + }, + { + xtype: 'textfield', + fieldLabel: gettext('Path'), + itemId: 'sourcePath', + name: 'sourcePath', + hidden: true, + disabled: true, + }, ); let optionsColumn1 = [ -- 2.30.2