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 E3A8864932 for ; Fri, 28 Jan 2022 12:30:35 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D39392E20D for ; Fri, 28 Jan 2022 12:30:05 +0100 (CET) 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 id A63302E201 for ; Fri, 28 Jan 2022 12:30:04 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7BEF54180A for ; Fri, 28 Jan 2022 12:30:04 +0100 (CET) Message-ID: <512cdb1a-8f67-4e44-e24b-ac81e94a7654@proxmox.com> Date: Fri, 28 Jan 2022 12:30:03 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:97.0) Gecko/20100101 Thunderbird/97.0 Content-Language: en-US To: Proxmox VE development discussion , Hannes Laimer References: <20220125124323.17638-1-h.laimer@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20220125124323.17638-1-h.laimer@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.062 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 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 T_SCC_BODY_TEXT_LINE -0.01 - 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: Re: [pve-devel] [PATCH pve-manager] api: add 'type' parameter to pool GET endpoint 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: Fri, 28 Jan 2022 11:30:35 -0000 On 25.01.22 13:43, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > 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 = {