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

pvesr: move destroy_job into API class, remove wrong permission checks.

Browse Source
This commit is contained in:
Dietmar Maurer
2017-05-05 11:18:30 +02:00
parent 339ca30a5b
commit 1d3ddfaf2c
2 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
PVE/API2/Storage/Replication.pm
View File

@ -44,9 +44,6 @@ __PACKAGE__->register_method ({
path => 'jobs',
method => 'GET',
description => "List replication jobs.",
permissions => {
user => 'all',
},
protected => 1,
proxyto => 'node',
parameters => {
@ -71,4 +68,28 @@ __PACKAGE__->register_method ({
return PVE::RESTHandler::hash_to_array($jobs, 'vmid');
}});
__PACKAGE__->register_method ({
name => 'destroy_job',
path => 'jobs/vmid',
method => 'DELETE',
description => "Destroy replication job.",
protected => 1,
parameters => {
additionalProperties => 0,
properties => {
vmid => {
description => "The VMID of the guest.",
type => 'string', format => 'pve-vmid',
},
},
},
returns => { type => 'null' },
code => sub {
my ($param) = @_;
PVE::ReplicationTools::destroy_replica($param->{vmid});
return undef;
}});
1;

37
PVE/CLI/pvesr.pm
View File

@ -121,44 +121,13 @@ __PACKAGE__->register_method ({
return undef;
}});
__PACKAGE__->register_method ({
name => 'destroyjob',
path => 'destroyjob',
method => 'DELETE',
description => "Destroy an async replication job",
permissions => {
description => {
check => ['perm', '/storage', ['Datastore.Allocate']],
},
},
protected => 1,
parameters => {
additionalProperties => 0,
properties => {
vmid => {
type => 'string', format => 'pve-vmid',
description => "The VMID of the guest.",
completion => \&PVE::Cluster::complete_local_vmid,
},
},
},
returns => { type => 'null' },
code => sub {
my ($param) = @_;
my $vmid = extract_param($param, 'vmid');
PVE::ReplicationTools::destroy_replica($vmid);
}});
our $cmddef = {
jobs => [ 'PVE::API2::Storage::Replication', 'jobs' , [],
{node => $nodename}, $print_job_list ],
destroyjob => [ 'PVE::API2::Storage::Replication', 'destroy_job' , ['vmid']],
run => [ __PACKAGE__ , 'run'],
destroyjob => [ __PACKAGE__ , 'destroyjob', ['vmid']],
};
1;