Signed-off-by: Fabian Grünbichler <f.gruenbich...@proxmox.com> --- PVE/API2/Pool.pm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm index 26ff7742e..9c232a971 100644 --- a/PVE/API2/Pool.pm +++ b/PVE/API2/Pool.pm @@ -6,6 +6,7 @@ use warnings; use PVE::AccessControl; use PVE::Cluster qw (cfs_read_file cfs_write_file); use PVE::Exception qw(raise_param_exc); +use PVE::GuestHelpers; use PVE::INotify; use PVE::JSONSchema qw(get_standard_option parse_property_string print_property_string); use PVE::Storage; @@ -78,6 +79,7 @@ __PACKAGE__->register_method ({ }, }, limits => { type => 'string', optional => 1 }, + usage => { type => 'object', optional => 1 }, }, }, links => [ { rel => 'child', href => "{poolid}" } ], @@ -135,17 +137,30 @@ __PACKAGE__->register_method ({ members => $members, }; $pool_info->{comment} = $pool_config->{comment} if defined($pool_config->{comment}); - $pool_info->{limits} = print_property_string($pool_config->{limits}, 'pve-pool-limits') - if defined($pool_config->{limits}); $pool_info->{poolid} = $poolid; + my $usage = PVE::Cluster::get_node_kv('pool-usage'); + $usage = PVE::GuestHelpers::get_pool_usage($usercfg->{pools}, $usage, $poolid); + if (my $limits = $pool_config->{limits}) { + $pool_info->{limits} = print_property_string($limits, 'pve-pool-limits'); + $usage->{$poolid}->{over} = PVE::GuestHelpers::check_pool_limits($usage->{$poolid}, $limits, 1); + } + $pool_info->{usage} = $usage->{$poolid}; + push @$res, $pool_info; } else { + my $usage = PVE::Cluster::get_node_kv('pool-usage'); + $usage = PVE::GuestHelpers::get_pool_usage($usercfg->{pools}, $usage); for my $pool (sort keys %{$usercfg->{pools}}) { next if !$rpcenv->check($authuser, "/pool/$pool", [ 'Pool.Audit' ], 1); my $entry = { poolid => $pool }; my $pool_config = $usercfg->{pools}->{$pool}; + if (my $limits = $pool_config->{limits}) { + $usage->{$pool}->{over} = PVE::GuestHelpers::check_pool_limits($usage->{$pool}, $limits, 1); + $entry->{limits} = print_property_string($limits, 'pve-pool-limits'); + } + $entry->{usage} = $usage->{$pool}; $entry->{comment} = $pool_config->{comment} if defined($pool_config->{comment}); push @$res, $entry; } -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel