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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 016DDAC52 for ; Tue, 8 Aug 2023 11:14:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D61F17846 for ; Tue, 8 Aug 2023 11:13:50 +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 for ; Tue, 8 Aug 2023 11:13:50 +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 F00E443694 for ; Tue, 8 Aug 2023 11:13:49 +0200 (CEST) From: Philipp Hufnagl To: pve-devel@lists.proxmox.com Date: Tue, 8 Aug 2023 11:13:42 +0200 Message-Id: <20230808091342.637190-1-p.hufnagl@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pool.pm] Subject: [pve-devel] [PATCH manager] fix #474: allow transfer from container/vms 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: Tue, 08 Aug 2023 09:14:21 -0000 When a member of 2 pools wants to transfer a vm/container to an other pool they can not do that. The vv/container would have first to be removed form the current pool resulting in a loss of privileges of the pool member for this vm/contianer. This feature introduces a way to transfer a vm between pools, guarded by a checkbox from accidental transfers Signed-off-by: Philipp Hufnagl --- PVE/API2/Pool.pm | 19 +++++++++++++++++-- www/manager6/grid/PoolMembers.js | 17 ++++++++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm index 007fc815..2f69911a 100644 --- a/PVE/API2/Pool.pm +++ b/PVE/API2/Pool.pm @@ -131,6 +131,11 @@ __PACKAGE__->register_method ({ type => 'string', format => 'pve-storage-id-list', optional => 1, }, + transfer => { + description => "Allow transfering vms to another pool.", + type => 'boolean', + optional => 1, + }, delete => { description => "Remove vms/storage (instead of adding it).", type => 'boolean', @@ -165,8 +170,18 @@ __PACKAGE__->register_method ({ } else { die "VM $vmid is already a pool member\n" if $pool_config->{vms}->{$vmid}; my $existing_pool = $usercfg->{vms}->{$vmid}; - die "VM $vmid belongs already to pool '$existing_pool'\n" if defined($existing_pool); - + if(defined($existing_pool) ) + { + if($param->{transfer}) + { + my $existing_pool_config = $usercfg->{pools}->{$existing_pool}; + delete $existing_pool_config->{vms}->{$vmid}; + } + else + { + die "VM $vmid belongs already to pool '$existing_pool' and transfer is not set\n"; + } + } $pool_config->{vms}->{$vmid} = 1; $usercfg->{vms}->{$vmid} = $pool; } diff --git a/www/manager6/grid/PoolMembers.js b/www/manager6/grid/PoolMembers.js index 6acb622d..224daca3 100644 --- a/www/manager6/grid/PoolMembers.js +++ b/www/manager6/grid/PoolMembers.js @@ -1,7 +1,7 @@ Ext.define('PVE.pool.AddVM', { extend: 'Proxmox.window.Edit', width: 600, - height: 400, + height: 420, isAdd: true, isCreate: true, initComponent: function() { @@ -30,7 +30,7 @@ Ext.define('PVE.pool.AddVM', { ], filters: [ function(item) { - return (item.data.type === 'lxc' || item.data.type === 'qemu') && item.data.pool === ''; + return (item.data.type === 'lxc' || item.data.type === 'qemu') &&item.data.pool !== me.pool; }, ], }); @@ -63,6 +63,10 @@ Ext.define('PVE.pool.AddVM', { header: gettext('Node'), dataIndex: 'node', }, + { + header: gettext('Pool'), + dataIndex: 'pool', + }, { header: gettext('Status'), dataIndex: 'uptime', @@ -85,9 +89,16 @@ Ext.define('PVE.pool.AddVM', { }, ], }); + + let transfer = Ext.create('Ext.form.field.Checkbox', { + name: 'transfer', + boxLabel: gettext('Allow Transfer'), + inputValue: 1, + value: 0, + }); Ext.apply(me, { subject: gettext('Virtual Machine'), - items: [vmsField, vmGrid], + items: [vmsField, vmGrid, transfer], }); me.callParent(); -- 2.39.2