[pve-devel] [PATCH manager 1/2] api: pools: support nested pools

Wolfgang Bumiller w.bumiller at proxmox.com
Fri Nov 17 12:58:13 CET 2023


minor issue

On Fri, Nov 17, 2023 at 08:09:10AM +0100, Fabian Grünbichler wrote:
> since poolid can now contain `/`, it's not possible to use it (properly) as
> path parameter anymore.
> 
> accordingly:
> - merge `read_pool` (`GET /pools/{poolid}`) into 'index' (`GET
>   /pools/?poolid={poolid}`) (requires clients to extract the only member of the returned array if they want to query an individual pool)
> - move `update_pool` to `/pools`, deprecating the old variant with path parameter
> - move `delete_pool` to `/pools`, deprecating the old variant with path parameter
> - deprecate `read_pool` API endpoint
> 
> pool creation is blocked for nested pools where the parent does not already
> exist. similarly, the checks for deletion are extended to block deletion if
> sub-pools still exist.
> 
> the old API endpoints continue to work for non-nested pools. `pvesh ls /pools`
> is semi-broken for nested pools, listing the entries, but no methods on them,
> since they reference the old API. fixing this would require extending the REST
> handling to support a new type of child reference.
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
> ---
> 
> Notes:
>     requires bumped pve-access-control
> 
>  PVE/API2/Pool.pm | 243 +++++++++++++++++++++++++++++++++++------------
>  1 file changed, 184 insertions(+), 59 deletions(-)
> 
> diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm
> index 51ac71941..54e744558 100644
> --- a/PVE/API2/Pool.pm
> +++ b/PVE/API2/Pool.pm
> @@ -354,6 +476,9 @@ __PACKAGE__->register_method ({
>  
>  	    my $pool_config = $usercfg->{pools}->{$pool};
>  	    die "pool '$pool' does not exist\n" if !$pool_config;
> +	    for my $subpool (sort keys %{$pool_config->{pools}}) {

would prefer $pool_config->{pools}->%*

> +		die "pool '$pool' is not empty (contains pool '$subpool')\n";

a 'for' loop for a single error entry, looks like you meant to do
something like this instead:

    if (length(my $subpools = join(', ', sort keys $pool_config->{pools}->%*))) {
        die "pool '$pool' is not empty (contains pool '$subpools')\n";
    }

> +	    }
>  
>  	    for my $vmid (sort keys %{$pool_config->{vms}}) {
>  		next if !$idlist->{$vmid}; # ignore destroyed guests
> -- 
> 2.39.2





More information about the pve-devel mailing list