[pve-devel] [PATCH pve-manager] api: add 'type' parameter to pool GET endpoint

[pve-devel] [PATCH pve-manager] api: add 'type' parameter to pool GET endpoint

[Hannes Laimer]

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
This was asked in a forum post, and it does not interfere with
anything else AFAIK.

 PVE/API2/Pool.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm
index 28c29ab8..b190d134 100644
--- a/PVE/API2/Pool.pm
+++ b/PVE/API2/Pool.pm
@@ -211,6 +211,11 @@ __PACKAGE__->register_method ({
 		type => 'string',
 		format => 'pve-poolid',
 	    },
+	    type => {
+		type => 'string',
+		enum => [ 'qemu', 'lxc', 'openvz', 'storage' ],
+		optional => 1,
+	    },
 	},
     },
     returns => {
@@ -271,7 +276,7 @@ __PACKAGE__->register_method ({
 	    my $vmdata = $idlist->{$vmid};
 	    next if !$vmdata;
 	    my $entry = PVE::API2Tools::extract_vm_stats($vmid, $vmdata, $rrd);
-	    push @$members, $entry;
+	    push @$members, $entry if !defined($param->{type}) or $param->{type} eq $entry->{type};
 	}
 
 	my $nodename = PVE::INotify::nodename();
@@ -289,7 +294,7 @@ __PACKAGE__->register_method ({
 	    }
 
 	    my $entry = PVE::API2Tools::extract_storage_stats($storeid, $scfg, $storage_node, $rrd);
-	    push @$members, $entry;
+	    push @$members, $entry if !defined($param->{type}) or $param->{type} eq $entry->{type};
 	}
 
 	my $res = {
-- 
2.30.2

Re: [pve-devel] [PATCH pve-manager] api: add 'type' parameter to pool GET endpoint

[Thomas Lamprecht]

On 25.01.22 13:43, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
> This was asked in a forum post, and it does not interfere with
> anything else AFAIK.

good call to add this, there's some slight optimization potential though

> 
>  PVE/API2/Pool.pm | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm
> index 28c29ab8..b190d134 100644
> --- a/PVE/API2/Pool.pm
> +++ b/PVE/API2/Pool.pm
> @@ -211,6 +211,11 @@ __PACKAGE__->register_method ({
>  		type => 'string',
>  		format => 'pve-poolid',
>  	    },
> +	    type => {
> +		type => 'string',
> +		enum => [ 'qemu', 'lxc', 'openvz', 'storage' ],

I'd avoid `openvz` in newly added stuff, while we have it around in some places
it won't work anyway and we'll probably rip out most of that in a next major
release.

> +		optional => 1,
> +	    },
>  	},
>      },
>      returns => {
> @@ -271,7 +276,7 @@ __PACKAGE__->register_method ({
>  	    my $vmdata = $idlist->{$vmid};
>  	    next if !$vmdata;
>  	    my $entry = PVE::API2Tools::extract_vm_stats($vmid, $vmdata, $rrd);
> -	    push @$members, $entry;
> +	    push @$members, $entry if !defined($param->{type}) or $param->{type} eq $entry->{type};

IIRC the 'type' is also in the VM list we get from PVE::Cluster::get_vmlist,
so we could just expand the `next` above, e.g.:

next if !$vmdata || (defined($param->{type}) && $param->{type} eq $vmdata->{type});

(untested)

>  	}
>  
>  	my $nodename = PVE::INotify::nodename();
> @@ -289,7 +294,7 @@ __PACKAGE__->register_method ({
>  	    }
>  
>  	    my $entry = PVE::API2Tools::extract_storage_stats($storeid, $scfg, $storage_node, $rrd);
> -	    push @$members, $entry;
> +	    push @$members, $entry if !defined($param->{type}) or $param->{type} eq $entry->{type};

we could guard the whole for loop that assembles storage stuff with a

if (!defined($param->{type}) || $param->{type} eq 'storage') {
   ...
}

to avoid doing work we don't use anyway.

>  	}
>  
>  	my $res = {