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 332F2BA9A for ; Thu, 10 Aug 2023 12:09:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1BB201F5FD for ; Thu, 10 Aug 2023 12:09:29 +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 ; Thu, 10 Aug 2023 12:09:28 +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 267BD43E5D for ; Thu, 10 Aug 2023 12:09:28 +0200 (CEST) From: Philipp Hufnagl To: pve-devel@lists.proxmox.com Date: Thu, 10 Aug 2023 12:09:01 +0200 Message-Id: <20230810100902.714456-2-p.hufnagl@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230810100902.714456-1-p.hufnagl@proxmox.com> References: <20230810100902.714456-1-p.hufnagl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.005 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 Subject: [pve-devel] [PATCH manager v4 1/2] fix #474: api: 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: Thu, 10 Aug 2023 10:09:29 -0000 When the newly introduced optional parameter "transfer" is set, the user add a vm/container to a pool even if it is already in one. If so it will be removed from the old pool Signed-off-by: Philipp Hufnagl --- PVE/API2/Pool.pm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm index 007fc815..3c0ae2a0 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 transferring VMs to another pool.", + type => 'boolean', + optional => 1, + }, delete => { description => "Remove vms/storage (instead of adding it).", type => 'boolean', @@ -165,8 +170,15 @@ __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}) { + $rpcenv->check($authuser, "/pool/$existing_pool", ['Pool.Allocate']); + 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; } -- 2.39.2