api2/storage/content: change to volume_size_info and add return properties
'file_size_info' only works for directory based storages, while 'volume_size_info' should work for all Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
committed by
Thomas Lamprecht
parent
6fef456c8d
commit
3369651885
@ -263,7 +263,30 @@ __PACKAGE__->register_method ({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
returns => { type => 'object' },
|
returns => {
|
||||||
|
type => 'object',
|
||||||
|
properties => {
|
||||||
|
path => {
|
||||||
|
description => "The Path",
|
||||||
|
type => 'string',
|
||||||
|
},
|
||||||
|
size => {
|
||||||
|
description => "Volume size in bytes.",
|
||||||
|
type => 'integer',
|
||||||
|
renderer => 'bytes',
|
||||||
|
},
|
||||||
|
used => {
|
||||||
|
description => "Used space. Please note that most storage plugins " .
|
||||||
|
"do not report anything useful here.",
|
||||||
|
type => 'integer',
|
||||||
|
renderer => 'bytes',
|
||||||
|
},
|
||||||
|
format => {
|
||||||
|
description => "Format identifier ('raw', 'qcow2', 'subvol', 'iso', 'tgz' ...)",
|
||||||
|
type => 'string',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
code => sub {
|
code => sub {
|
||||||
my ($param) = @_;
|
my ($param) = @_;
|
||||||
|
|
||||||
@ -277,8 +300,8 @@ __PACKAGE__->register_method ({
|
|||||||
PVE::Storage::check_volume_access($rpcenv, $authuser, $cfg, undef, $volid);
|
PVE::Storage::check_volume_access($rpcenv, $authuser, $cfg, undef, $volid);
|
||||||
|
|
||||||
my $path = PVE::Storage::path($cfg, $volid);
|
my $path = PVE::Storage::path($cfg, $volid);
|
||||||
my ($size, $format, $used, $parent) = PVE::Storage::file_size_info($path);
|
my ($size, $format, $used, $parent) = PVE::Storage::volume_size_info($cfg, $volid);
|
||||||
die "file_size_info on '$volid' failed\n" if !($format && $size);
|
die "volume_size_info on '$volid' failed\n" if !($format && $size);
|
||||||
|
|
||||||
# fixme: return more attributes?
|
# fixme: return more attributes?
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user