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

whitespace cleanup

Browse Source 
Signed-off-by: Tim Marx <t.marx@proxmox.com>
This commit is contained in:
Tim Marx
2019-11-05 13:42:17 +01:00
committed by Thomas Lamprecht
parent 6ed43d81dc
commit 9148f5b355
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
PVE/API2/Storage/Content.pm
View File

@ -16,23 +16,23 @@ use PVE::JSONSchema qw(get_standard_option);
use base qw(PVE::RESTHandler); use base qw(PVE::RESTHandler);
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'index', name => 'index',
path => '', path => '',
method => 'GET', method => 'GET',
description => "List storage content.", description => "List storage content.",
permissions => { permissions => {
check => ['perm', '/storage/{storage}', ['Datastore.Audit', 'Datastore.AllocateSpace'], any => 1], check => ['perm', '/storage/{storage}', ['Datastore.Audit', 'Datastore.AllocateSpace'], any => 1],
}, },
protected => 1, protected => 1,
proxyto => 'node', proxyto => 'node',
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
storage => get_standard_option('pve-storage-id', { storage => get_standard_option('pve-storage-id', {
completion => \&PVE::Storage::complete_storage_enabled, completion => \&PVE::Storage::complete_storage_enabled,
}), }),
content => { content => {
description => "Only list content of this type.", description => "Only list content of this type.",
type => 'string', format => 'pve-storage-content', type => 'string', format => 'pve-storage-content',
optional => 1, optional => 1,
@ -49,7 +49,7 @@ __PACKAGE__->register_method ({
type => 'array', type => 'array',
items => { items => {
type => "object", type => "object",
properties => { properties => {
volid => { volid => {
description => "Volume identifier.", description => "Volume identifier.",
type => 'string', type => 'string',
@ -104,27 +104,27 @@ __PACKAGE__->register_method ({
push @$res, $item; push @$res, $item;
} }
return $res; return $res;
}}); }});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'create', name => 'create',
path => '', path => '',
method => 'POST', method => 'POST',
description => "Allocate disk images.", description => "Allocate disk images.",
permissions => { permissions => {
check => ['perm', '/storage/{storage}', ['Datastore.AllocateSpace']], check => ['perm', '/storage/{storage}', ['Datastore.AllocateSpace']],
}, },
protected => 1, protected => 1,
proxyto => 'node', proxyto => 'node',
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
storage => get_standard_option('pve-storage-id', { storage => get_standard_option('pve-storage-id', {
completion => \&PVE::Storage::complete_storage_enabled, completion => \&PVE::Storage::complete_storage_enabled,
}), }),
filename => { filename => {
description => "The name of the file to create.", description => "The name of the file to create.",
type => 'string', type => 'string',
}, },
@ -171,16 +171,16 @@ __PACKAGE__->register_method ({
if ($name =~ m/\.(raw|qcow2|vmdk)$/) { if ($name =~ m/\.(raw|qcow2|vmdk)$/) {
my $fmt = $1; my $fmt = $1;
raise_param_exc({ format => "different storage formats ($param->{format} != $fmt)" }) raise_param_exc({ format => "different storage formats ($param->{format} != $fmt)" })
if $param->{format} && $param->{format} ne $fmt; if $param->{format} && $param->{format} ne $fmt;
$param->{format} = $fmt; $param->{format} = $fmt;
} }
my $cfg = PVE::Storage::config(); my $cfg = PVE::Storage::config();
my $volid = PVE::Storage::vdisk_alloc ($cfg, $storeid, $param->{vmid}, my $volid = PVE::Storage::vdisk_alloc ($cfg, $storeid, $param->{vmid},
$param->{format}, $param->{format},
$name, $size); $name, $size);
return $volid; return $volid;
@ -201,12 +201,12 @@ my $real_volume_id = sub {
$volid = $volume; $volid = $volume;
$storeid = $sid; $storeid = $sid;
}; };
raise_param_exc({ volume => $@ }) if $@; raise_param_exc({ volume => $@ }) if $@;
} else { } else {
raise_param_exc({ volume => "no storage speficied - incomplete volume ID" }) raise_param_exc({ volume => "no storage speficied - incomplete volume ID" })
if !$storeid; if !$storeid;
$volid = "$storeid:$volume"; $volid = "$storeid:$volume";
} }
@ -218,7 +218,7 @@ __PACKAGE__->register_method ({
path => '{volume}', path => '{volume}',
method => 'GET', method => 'GET',
description => "Get volume attributes", description => "Get volume attributes",
permissions => { permissions => {
description => "You need read access for the volume.", description => "You need read access for the volume.",
user => 'all', user => 'all',
}, },
@ -226,12 +226,12 @@ __PACKAGE__->register_method ({
proxyto => 'node', proxyto => 'node',
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
storage => get_standard_option('pve-storage-id', { optional => 1 }), storage => get_standard_option('pve-storage-id', { optional => 1 }),
volume => { volume => {
description => "Volume identifier", description => "Volume identifier",
type => 'string', type => 'string',
}, },
}, },
}, },
@ -266,7 +266,7 @@ __PACKAGE__->register_method ({
path => '{volume}', path => '{volume}',
method => 'DELETE', method => 'DELETE',
description => "Delete volume", description => "Delete volume",
permissions => { permissions => {
description => "You need 'Datastore.Allocate' privilege on the storage (or 'Datastore.AllocateSpace' for backup volumes if you have VM.Backup privilege on the VM).", description => "You need 'Datastore.Allocate' privilege on the storage (or 'Datastore.AllocateSpace' for backup volumes if you have VM.Backup privilege on the VM).",
user => 'all', user => 'all',
}, },
@ -274,7 +274,7 @@ __PACKAGE__->register_method ({
proxyto => 'node', proxyto => 'node',
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
storage => get_standard_option('pve-storage-id', { storage => get_standard_option('pve-storage-id', {
optional => 1, optional => 1,
@ -354,24 +354,24 @@ __PACKAGE__->register_method ({
proxyto => 'node', proxyto => 'node',
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
storage => get_standard_option('pve-storage-id', { optional => 1}), storage => get_standard_option('pve-storage-id', { optional => 1}),
volume => { volume => {
description => "Source volume identifier", description => "Source volume identifier",
type => 'string', type => 'string',
}, },
target => { target => {
description => "Target volume identifier", description => "Target volume identifier",
type => 'string', type => 'string',
}, },
target_node => get_standard_option('pve-node', { target_node => get_standard_option('pve-node', {
description => "Target node. Default is local node.", description => "Target node. Default is local node.",
optional => 1, optional => 1,
}), }),
}, },
}, },
returns => { returns => {
type => 'string', type => 'string',
}, },
code => sub { code => sub {