api: disks: add DELETE endpoint for directory, lvm, lvmthin, zfs

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>

diff --git a/PVE/API2/Disks/Directory.pm b/PVE/API2/Disks/Directory.pm
index 3a90a2ed0d5de75ca2ab4b011f52fa9e4f618010..36cebbc9d2a271da62460c15c530ea361a6e797d 100644 (file)
--- a/PVE/API2/Disks/Directory.pm
+++ b/PVE/API2/Disks/Directory.pm
@@ -3,6 +3,8 @@ package PVE::API2::Disks::Directory;
 use strict;
 use warnings;
 
+use POSIX;
+
 use PVE::Diskmanage;
 use PVE::JSONSchema qw(get_standard_option);
 use PVE::RESTHandler;
@@ -301,4 +303,46 @@ __PACKAGE__->register_method ({
        return $rpcenv->fork_worker('dircreate', $name, $user, $worker);
     }});
 
+__PACKAGE__->register_method ({
+    name => 'delete',
+    path => '{name}',
+    method => 'DELETE',
+    proxyto => 'node',
+    protected => 1,
+    permissions => {
+       check => ['perm', '/', ['Sys.Modify', 'Datastore.Allocate']],
+    },
+    description => "Unmounts the storage and removes the mount unit.",
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           name => get_standard_option('pve-storage-id'),
+       },
+    },
+    returns => { type => 'string' },
+    code => sub {
+       my ($param) = @_;
+
+       my $rpcenv = PVE::RPCEnvironment::get();
+       my $user = $rpcenv->get_user();
+
+       my $name = $param->{name};
+
+       my $worker = sub {
+           my $path = "/mnt/pve/$name";
+           my $mountunitname = PVE::Systemd::escape_unit($path, 1) . ".mount";
+           my $mountunitpath = "/etc/systemd/system/$mountunitname";
+
+           PVE::Diskmanage::locked_disk_action(sub {
+               run_command(['systemctl', 'stop', $mountunitname]);
+               run_command(['systemctl', 'disable', $mountunitname]);
+
+               unlink $mountunitpath or $! == ENOENT or die "cannot remove $mountunitpath - $!\n";
+           });
+       };
+
+       return $rpcenv->fork_worker('dirremove', $name, $user, $worker);
+    }});
+
 1;

diff --git a/PVE/API2/Disks/LVM.pm b/PVE/API2/Disks/LVM.pm
index 885e02b585c5059118345fd7423e033509e54aeb..ee9e282faf76b971d923731da1978167d35b7eca 100644 (file)
--- a/PVE/API2/Disks/LVM.pm
+++ b/PVE/API2/Disks/LVM.pm
@@ -187,4 +187,39 @@ __PACKAGE__->register_method ({
        return $rpcenv->fork_worker('lvmcreate', $name, $user, $worker);
     }});
 
+__PACKAGE__->register_method ({
+    name => 'delete',
+    path => '{name}',
+    method => 'DELETE',
+    proxyto => 'node',
+    protected => 1,
+    permissions => {
+       check => ['perm', '/', ['Sys.Modify', 'Datastore.Allocate']],
+    },
+    description => "Remove an LVM Volume Group.",
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           name => get_standard_option('pve-storage-id'),
+       },
+    },
+    returns => { type => 'string' },
+    code => sub {
+       my ($param) = @_;
+
+       my $rpcenv = PVE::RPCEnvironment::get();
+       my $user = $rpcenv->get_user();
+
+       my $name = $param->{name};
+
+       my $worker = sub {
+           PVE::Diskmanage::locked_disk_action(sub {
+               PVE::Storage::LVMPlugin::lvm_destroy_volume_group($name);
+           });
+       };
+
+       return $rpcenv->fork_worker('lvmremove', $name, $user, $worker);
+    }});
+
 1;

diff --git a/PVE/API2/Disks/LVMThin.pm b/PVE/API2/Disks/LVMThin.pm
index ced4b6a149e4fc3f0aded96edbca5421d04c0a53..52f3062be5c48f7a76a62cc286e66e88c8c1838a 100644 (file)
--- a/PVE/API2/Disks/LVMThin.pm
+++ b/PVE/API2/Disks/LVMThin.pm
@@ -165,4 +165,46 @@ __PACKAGE__->register_method ({
        return $rpcenv->fork_worker('lvmthincreate', $name, $user, $worker);
     }});
 
+__PACKAGE__->register_method ({
+    name => 'delete',
+    path => '{name}',
+    method => 'DELETE',
+    proxyto => 'node',
+    protected => 1,
+    permissions => {
+       check => ['perm', '/', ['Sys.Modify', 'Datastore.Allocate']],
+    },
+    description => "Remove an LVM thin pool.",
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           name => get_standard_option('pve-storage-id'),
+           'volume-group' => get_standard_option('pve-storage-id'),
+       },
+    },
+    returns => { type => 'string' },
+    code => sub {
+       my ($param) = @_;
+
+       my $rpcenv = PVE::RPCEnvironment::get();
+       my $user = $rpcenv->get_user();
+
+       my $vg = $param->{'volume-group'};
+       my $lv = $param->{name};
+
+       my $worker = sub {
+           PVE::Diskmanage::locked_disk_action(sub {
+               my $thinpools = PVE::Storage::LvmThinPlugin::list_thinpools();
+
+               die "no such thin pool ${vg}/${lv}\n"
+                   if !grep { $_->{lv} eq $lv && $_->{vg} eq $vg } $thinpools->@*;
+
+               run_command(['lvremove', '-y', "${vg}/${lv}"]);
+           });
+       };
+
+       return $rpcenv->fork_worker('lvmthinremove', "${vg}-${lv}", $user, $worker);
+    }});
+
 1;

diff --git a/PVE/API2/Disks/ZFS.pm b/PVE/API2/Disks/ZFS.pm
index 7f96bb7cc338140a3bd625a9c3e72428ae241e1c..e8d5e7c1c8d83afa27f6ec90b7c749cb94c844cd 100644 (file)
--- a/PVE/API2/Disks/ZFS.pm
+++ b/PVE/API2/Disks/ZFS.pm
@@ -449,4 +449,44 @@ __PACKAGE__->register_method ({
        return $rpcenv->fork_worker('zfscreate', $name, $user, $worker);
     }});
 
+__PACKAGE__->register_method ({
+    name => 'delete',
+    path => '{name}',
+    method => 'DELETE',
+    proxyto => 'node',
+    protected => 1,
+    permissions => {
+       check => ['perm', '/', ['Sys.Modify', 'Datastore.Allocate']],
+    },
+    description => "Destroy a ZFS pool.",
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           name => get_standard_option('pve-storage-id'),
+       },
+    },
+    returns => { type => 'string' },
+    code => sub {
+       my ($param) = @_;
+
+       my $rpcenv = PVE::RPCEnvironment::get();
+       my $user = $rpcenv->get_user();
+
+       my $name = $param->{name};
+
+       my $worker = sub {
+           PVE::Diskmanage::locked_disk_action(sub {
+               if (-e '/lib/systemd/system/zfs-import@.service') {
+                   my $importunit = 'zfs-import@' . PVE::Systemd::escape_unit($name) . '.service';
+                   run_command(['systemctl', 'disable', $importunit]);
+               }
+
+               run_command(['zpool', 'destroy', $name]);
+           });
+       };
+
+       return $rpcenv->fork_worker('zfsremove', $name, $user, $worker);
+    }});
+
 1;