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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 75E1064F53 for ; Mon, 31 Jan 2022 12:17:13 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6103A23B4E for ; Mon, 31 Jan 2022 12:16:43 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 3284023B43 for ; Mon, 31 Jan 2022 12:16:42 +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 0872E4481E for ; Mon, 31 Jan 2022 12:16:42 +0100 (CET) From: Hannes Laimer To: pve-devel@lists.proxmox.com Date: Mon, 31 Jan 2022 12:16:33 +0100 Message-Id: <20220131111633.17155-1-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 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 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 - Subject: [pve-devel] [PATCH pve-manager v3] 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: Mon, 31 Jan 2022 11:17:13 -0000 Signed-off-by: Hannes Laimer --- v3: - fix logic, eq -> ne v2(based on Thomas Lamprecht 's feedback): - remove openzv - optimize loops This was asked in a forum post, and it does not interfere with anything else AFAIK. PVE/API2/Pool.pm | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm index 28c29ab8..007fc815 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', 'storage' ], + optional => 1, + }, }, }, returns => { @@ -269,27 +274,29 @@ __PACKAGE__->register_method ({ my $members = []; for my $vmid (sort keys %{$pool_config->{vms}}) { my $vmdata = $idlist->{$vmid}; - next if !$vmdata; + next if !$vmdata || defined($param->{type}) && $param->{type} ne $vmdata->{type}; my $entry = PVE::API2Tools::extract_vm_stats($vmid, $vmdata, $rrd); push @$members, $entry; } my $nodename = PVE::INotify::nodename(); my $cfg = PVE::Storage::config(); - for my $storeid (sort keys %{$pool_config->{storage}}) { - my $scfg = PVE::Storage::storage_config ($cfg, $storeid, 1); - next if !$scfg; - - my $storage_node = $nodename; # prefer local node - if ($scfg->{nodes} && !$scfg->{nodes}->{$storage_node}) { - for my $node (sort keys(%{$scfg->{nodes}})) { - $storage_node = $node; - last; + if (!defined($param->{type}) || $param->{type} eq 'storage') { + for my $storeid (sort keys %{$pool_config->{storage}}) { + my $scfg = PVE::Storage::storage_config ($cfg, $storeid, 1); + next if !$scfg; + + my $storage_node = $nodename; # prefer local node + if ($scfg->{nodes} && !$scfg->{nodes}->{$storage_node}) { + for my $node (sort keys(%{$scfg->{nodes}})) { + $storage_node = $node; + last; + } } - } - my $entry = PVE::API2Tools::extract_storage_stats($storeid, $scfg, $storage_node, $rrd); - push @$members, $entry; + my $entry = PVE::API2Tools::extract_storage_stats($storeid, $scfg, $storage_node, $rrd); + push @$members, $entry; + } } my $res = { -- 2.30.2