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

extend storage list API with useful parameters for clone

Browse Source 
Add ability to list shared storages availavlable on souce and target node.
This commit is contained in:
Dietmar Maurer
2013-05-14 09:56:11 +02:00
parent 0b8818aae7
commit 283608f330
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PVE/API2/Storage/Config.pm
View File

@ -54,7 +54,6 @@ __PACKAGE__->register_method ({
enum => $storage_type_enum, enum => $storage_type_enum,
optional => 1, optional => 1,
}, },
}, },
}, },
returns => { returns => {

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

@ -50,6 +50,16 @@ __PACKAGE__->register_method ({
type => 'string', format => 'pve-storage-content', type => 'string', format => 'pve-storage-content',
optional => 1, optional => 1,
}, },
enabled => {
description => "Only list stores which are enabled (not disabled in config).",
type => 'boolean',
optional => 0,
},
target => get_standard_option('pve-node', {
description => "If target is different to 'node', we only lists shared storages which " .
"content is accessible on this 'node' and the specified 'target' node.",
optional => 1,
}),
}, },
}, },
returns => { returns => {
@ -66,6 +76,12 @@ __PACKAGE__->register_method ({
my $rpcenv = PVE::RPCEnvironment::get(); my $rpcenv = PVE::RPCEnvironment::get();
my $authuser = $rpcenv->get_user(); my $authuser = $rpcenv->get_user();
my $localnode = PVE::INotify::nodename();
my $target = $param->{target};
undef $target if $target && ($target eq $localnode || $target eq 'localhost');
my $cfg = cfs_read_file("storage.cfg"); my $cfg = cfs_read_file("storage.cfg");
my $info = PVE::Storage::storage_info($cfg, $param->{content}); my $info = PVE::Storage::storage_info($cfg, $param->{content});
@ -80,6 +96,20 @@ __PACKAGE__->register_method ({
my $privs = [ 'Datastore.Audit', 'Datastore.AllocateSpace' ]; my $privs = [ 'Datastore.Audit', 'Datastore.AllocateSpace' ];
next if !$rpcenv->check_any($authuser, "/storage/$storeid", $privs, 1); next if !$rpcenv->check_any($authuser, "/storage/$storeid", $privs, 1);
next if $param->{storage} && $param->{storage} ne $storeid; next if $param->{storage} && $param->{storage} ne $storeid;
my $scfg = PVE::Storage::storage_config($cfg, $storeid);
next if $param->{enabled} && $scfg->{disable};
if ($target) {
# check if storage content is accessible on local node and specified target node
# we use this on the Clone GUI
next if !$scfg->{shared};
next if !PVE::Storage::storage_check_node($cfg, $storeid, undef, 1);
next if !PVE::Storage::storage_check_node($cfg, $storeid, $target, 1);
}
$res->{$storeid} = $info->{$storeid}; $res->{$storeid} = $info->{$storeid};
} }