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 4BA90B5DA for ; Wed, 9 Aug 2023 13:33:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 224181459E for ; Wed, 9 Aug 2023 13:32:57 +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 ; Wed, 9 Aug 2023 13:32:56 +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 2413B438B4 for ; Wed, 9 Aug 2023 13:32:56 +0200 (CEST) Message-ID: Date: Wed, 9 Aug 2023 13:32:55 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.1 Content-Language: en-US To: Proxmox VE development discussion , Philipp Hufnagl References: <20230808091342.637190-1-p.hufnagl@proxmox.com> From: Fiona Ebner In-Reply-To: <20230808091342.637190-1-p.hufnagl@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 2.016 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 NICE_REPLY_A -4.14 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [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: Wed, 09 Aug 2023 11:33:27 -0000 Am 08.08.23 um 11:13 schrieb Philipp Hufnagl: > 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 > Nit: there's an additional space at the start of each line, also some typos, e.g. vv/contianer > Signed-off-by: Philipp Hufnagl > --- > PVE/API2/Pool.pm | 19 +++++++++++++++++-- > www/manager6/grid/PoolMembers.js | 17 ++++++++++++++--- > 2 files changed, 31 insertions(+), 5 deletions(-) The backend and UI changes should be two different patches. > > 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.", s/transfering vms/transferring VMs/ > + 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}) Style nit: both ifs are missing a space after the keyword, the upper one has a space too much before the parenthesis. The curly braces should be on the same line > + { > + my $existing_pool_config = $usercfg->{pools}->{$existing_pool}; The permission for the original pool should be checked here?! Or is that already done somewhere? > + delete $existing_pool_config->{vms}->{$vmid}; > + } > + else > + { Style nit: should be } 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; > }