yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

storage status API: allow to filter multiple content types

Browse Source
This commit is contained in:
Dietmar Maurer
2015-08-07 09:44:22 +02:00
parent 27ff0e99e2
commit 583c2802f8
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/Storage/Status.pm
View File

@ -47,7 +47,7 @@ __PACKAGE__->register_method ({
}), }),
content => { content => {
description => "Only list stores which support this content type.", description => "Only list stores which support this content type.",
type => 'string', format => 'pve-storage-content', type => 'string', format => 'pve-storage-content-list',
optional => 1, optional => 1,
}, },
enabled => { enabled => {

15
PVE/Storage.pm
View File

@ -882,14 +882,23 @@ sub storage_info {
my $ids = $cfg->{ids}; my $ids = $cfg->{ids};
my $info = {}; my $info = {};
my @ctypes = PVE::Tools::split_list($content);
my $slist = []; my $slist = [];
foreach my $storeid (keys %$ids) { foreach my $storeid (keys %$ids) {
next if $content && !$ids->{$storeid}->{content}->{$content};
next if !storage_check_enabled($cfg, $storeid, undef, 1); next if !storage_check_enabled($cfg, $storeid, undef, 1);
my $want_ctype = 0;
foreach my $ctype (@ctypes) {
if ($ids->{$storeid}->{content}->{$ctype}) {
$want_ctype = 1;
last;
}
}
next if !$want_ctype;
my $type = $ids->{$storeid}->{type}; my $type = $ids->{$storeid}->{type};
$info->{$storeid} = { $info->{$storeid} = {