* [pve-devel] [PATCH v4 manager 2/4] ui: qemu/HardwareView: white space fixes
2020-12-15 13:39 [pve-devel] [PATCH v4 series 0/4] Add GUI for disk reassignment Aaron Lauterer
2020-12-15 13:39 ` [pve-devel] [PATCH v4 widget-toolkit 1/4] window/edit: add option to disable reset button Aaron Lauterer
@ 2020-12-15 13:39 ` Aaron Lauterer
2020-12-15 13:39 ` [pve-devel] [PATCH v4 manager 3/4] ui: utils: add method to get VM data from resource store Aaron Lauterer
2020-12-15 13:39 ` [pve-devel] [PATCH v4 manager 4/4] ui: qemu: Add disk reassign dialog Aaron Lauterer
3 siblings, 0 replies; 5+ messages in thread
From: Aaron Lauterer @ 2020-12-15 13:39 UTC (permalink / raw)
To: pve-devel
Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
v1 -> v2 -> v3 -> v4: nothing changed
www/manager6/qemu/HardwareView.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 40b3fe86..b641317d 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -48,7 +48,7 @@ Ext.define('PVE.qemu.HardwareView', {
var i, confid;
var nodename = me.pveSelNode.data.node;
- if (!nodename) {
+ if (!nodename) {
throw "no node name specified";
}
@@ -93,7 +93,7 @@ Ext.define('PVE.qemu.HardwareView', {
sockets: {
header: gettext('Processors'),
never_delete: true,
- editor: (caps.vms['VM.Config.CPU'] || caps.vms['VM.Config.HWType']) ?
+ editor: (caps.vms['VM.Config.CPU'] || caps.vms['VM.Config.HWType']) ?
'PVE.qemu.ProcessorEdit' : undefined,
tdCls: 'pve-itype-icon-processor',
group: 3,
@@ -151,7 +151,7 @@ Ext.define('PVE.qemu.HardwareView', {
iconCls: 'desktop',
group:5,
defaultValue: '',
- renderer: PVE.Utils.render_kvm_vga_driver
+ renderer: PVE.Utils.render_kvm_vga_driver
},
machine: {
header: gettext('Machine'),
@@ -318,7 +318,7 @@ Ext.define('PVE.qemu.HardwareView', {
if ((g1 - g2) !== 0) {
return g1 - g2;
}
-
+
if ((order1 - order2) !== 0) {
return order1 - order2;
}
@@ -612,7 +612,7 @@ Ext.define('PVE.qemu.HardwareView', {
interval: 5000,
selModel: sm,
run_editor: run_editor,
- tbar: [
+ tbar: [
{
text: gettext('Add'),
menu: new Ext.menu.Menu({
--
2.20.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [pve-devel] [PATCH v4 manager 4/4] ui: qemu: Add disk reassign dialog
2020-12-15 13:39 [pve-devel] [PATCH v4 series 0/4] Add GUI for disk reassignment Aaron Lauterer
` (2 preceding siblings ...)
2020-12-15 13:39 ` [pve-devel] [PATCH v4 manager 3/4] ui: utils: add method to get VM data from resource store Aaron Lauterer
@ 2020-12-15 13:39 ` Aaron Lauterer
3 siblings, 0 replies; 5+ messages in thread
From: Aaron Lauterer @ 2020-12-15 13:39 UTC (permalink / raw)
To: pve-devel
Adds a new button to the hardware panel labeled 'Reassign disk' and
enables a user to reassign a disk to another VM.
Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
v3 -> v4:
* added check to not show template VMs in dropdown
* renamed disk parameter to `drive_name`
v2 -> v3:
* fixed check to omit the current vmid in the target dropdown
* renamed parameter disk to drive_key
* added missing comma
v1 -> v2: fixed linter errors
This patch needs the previous patch series [0] applied which adds the
backend for disk reassignments.
[0] https://lists.proxmox.com/pipermail/pve-devel/2020-December/046479.html
www/manager6/Makefile | 1 +
www/manager6/qemu/HDReassign.js | 80 +++++++++++++++++++++++++++++++
www/manager6/qemu/HardwareView.js | 30 ++++++++++++
3 files changed, 111 insertions(+)
create mode 100644 www/manager6/qemu/HDReassign.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 85f90ecd..21debfcb 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -200,6 +200,7 @@ JSSRC= \
qemu/HDEdit.js \
qemu/HDEfi.js \
qemu/HDMove.js \
+ qemu/HDReassign.js \
qemu/HDResize.js \
qemu/HardwareView.js \
qemu/IPConfigEdit.js \
diff --git a/www/manager6/qemu/HDReassign.js b/www/manager6/qemu/HDReassign.js
new file mode 100644
index 00000000..d0aa97f8
--- /dev/null
+++ b/www/manager6/qemu/HDReassign.js
@@ -0,0 +1,80 @@
+Ext.define('PVE.window.HDReassign', {
+ extend: 'Proxmox.window.Edit',
+
+ resizeable: false,
+ title: gettext('Reassign disk'),
+ submitText: gettext('Reassign disk'),
+ showReset: false,
+ method: 'POST',
+ showProgress: true,
+ width: 350,
+
+ viewModel: {
+ data: {
+ targetVMData: {},
+ show_running_hint: false,
+ },
+ },
+
+ items: [
+ {
+ xtype: 'combobox',
+ name: 'target_vmid',
+ reference: 'target_vmid',
+ fieldLabel: gettext('Target VMID'),
+ bind: {
+ store: '{targetVMData}',
+ },
+ queryMode: 'local',
+ displayField: 'name',
+ valueField: 'vmid',
+ anyMatch: true,
+ emptyText: gettext('Select VM'),
+ },
+ {
+ xtype: 'displayfield',
+ padding: '5 0 0 0',
+ userCls: 'pmx-hint',
+ value: gettext('This disk cannot be reassigned while the VM is running'),
+ bind: {
+ hidden: '{!show_running_hint}',
+ },
+ },
+ ],
+
+ controller: {
+ xclass: 'Ext.app.ViewController',
+ init: function(view) {
+ let me = view;
+ let vm = me.getViewModel();
+ let vms = PVE.Utils.getNodeVMs(me.nodename);
+
+ let show_running_hint = vms[me.vmid].running && !me.drive_name.startsWith('unused');
+ vm.set('show_running_hint', show_running_hint);
+
+ if (show_running_hint) {
+ me.lookup('target_vmid').setDisabled(true);
+ }
+
+ let dropdownData = [];
+ for (const [vmid, data] of Object.entries(vms)) {
+ if (parseInt(vmid, 10) === parseInt(me.vmid, 10)) { continue; }
+ if (data.template) { continue; }
+ dropdownData.push({
+ vmid: vmid,
+ name: `${vmid} ${data.name}`,
+ });
+ }
+
+ vm.set('targetVMData', { data: dropdownData });
+ },
+ },
+
+ getValues: function() {
+ let me = this;
+ let values = me.callParent(arguments);
+ values.drive_name = me.drive_name;
+
+ return values;
+ },
+});
diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index b641317d..7b357856 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -415,6 +415,25 @@ Ext.define('PVE.qemu.HardwareView', {
win.on('destroy', me.reload, me);
};
+ var run_reassign = function() {
+ let rec = sm.getSelection()[0];
+ if (!rec) {
+ return;
+ }
+
+ let win = Ext.create('PVE.window.HDReassign', {
+ drive_name: rec.data.key,
+ vmid: vmid,
+ nodename: nodename,
+ title: gettext('Reassign disk') + ': ' + rec.data.key,
+ url: '/api2/extjs/nodes/' + nodename + '/qemu/' + vmid + '/reassign_disk',
+ });
+
+ win.show();
+
+ win.on('destroy', me.reload, me);
+ };
+
var edit_btn = new Proxmox.button.Button({
text: gettext('Edit'),
selModel: sm,
@@ -436,6 +455,13 @@ Ext.define('PVE.qemu.HardwareView', {
handler: run_move
});
+ var reassign_btn = new Proxmox.button.Button({
+ text: gettext('Reassign disk'),
+ selModel: sm,
+ disabled: true,
+ handler: run_reassign,
+ });
+
var remove_btn = new Proxmox.button.Button({
text: gettext('Remove'),
defaultText: gettext('Remove'),
@@ -577,6 +603,7 @@ Ext.define('PVE.qemu.HardwareView', {
edit_btn.disable();
resize_btn.disable();
move_btn.disable();
+ reassign_btn.disable();
revert_btn.disable();
return;
}
@@ -603,6 +630,8 @@ Ext.define('PVE.qemu.HardwareView', {
move_btn.setDisabled(pending || !(isUsedDisk || isEfi) || !diskCap);
+ reassign_btn.setDisabled(pending || !(isUsedDisk || isEfi || isUnusedDisk) || !diskCap);
+
revert_btn.setDisabled(!pending);
};
@@ -752,6 +781,7 @@ Ext.define('PVE.qemu.HardwareView', {
edit_btn,
resize_btn,
move_btn,
+ reassign_btn,
revert_btn
],
rows: rows,
--
2.20.1
^ permalink raw reply [flat|nested] 5+ messages in thread