rename check_available to assert_sid_unused

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/API2/Disks/Directory.pm b/PVE/API2/Disks/Directory.pm
index d76cf10174f165626a3502286bc2f7c26c240023..27009f5021b42d877cd28dffb882ca1de6c0306d 100644 (file)
--- a/PVE/API2/Disks/Directory.pm
+++ b/PVE/API2/Disks/Directory.pm
@@ -202,7 +202,7 @@ __PACKAGE__->register_method ({
 
        $dev = PVE::Diskmanage::verify_blockdev_path($dev);
        PVE::Diskmanage::check_unused($dev);
-       PVE::Storage::check_available($name) if $param->{add_storage};
+       PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
 
        my $worker = sub {
            my $path = "/mnt/pve/$name";

diff --git a/PVE/API2/Disks/LVM.pm b/PVE/API2/Disks/LVM.pm
index 9556a2451e8d332be29eb698d0165d886ab680d2..7f8c3190dd568490af0b16c90c12d24b49a8c068 100644 (file)
--- a/PVE/API2/Disks/LVM.pm
+++ b/PVE/API2/Disks/LVM.pm
@@ -150,7 +150,7 @@ __PACKAGE__->register_method ({
 
        $dev = PVE::Diskmanage::verify_blockdev_path($dev);
        PVE::Diskmanage::check_unused($dev);
-       PVE::Storage::check_available($name) if $param->{add_storage};
+       PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
 
        my $worker = sub {
            PVE::Diskmanage::locked_disk_action(sub {

diff --git a/PVE/API2/Disks/LVMThin.pm b/PVE/API2/Disks/LVMThin.pm
index 717897d8b3c94d8fee25ea97f7bdcb276aaac676..596d39347be534ee387d6cd0b8cced0f34d2601c 100644 (file)
--- a/PVE/API2/Disks/LVMThin.pm
+++ b/PVE/API2/Disks/LVMThin.pm
@@ -104,7 +104,7 @@ __PACKAGE__->register_method ({
 
        $dev = PVE::Diskmanage::verify_blockdev_path($dev);
        PVE::Diskmanage::check_unused($dev);
-       PVE::Storage::check_available($name) if $param->{add_storage};
+       PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
 
        my $worker = sub {
            PVE::Diskmanage::locked_disk_action(sub {

diff --git a/PVE/API2/Disks/ZFS.pm b/PVE/API2/Disks/ZFS.pm
index a44f57388302b2f1a79277e95560d27c85a811b3..f187eb2dec8f3a018ff2784fbe27031444688f75 100644 (file)
--- a/PVE/API2/Disks/ZFS.pm
+++ b/PVE/API2/Disks/ZFS.pm
@@ -344,7 +344,7 @@ __PACKAGE__->register_method ({
            PVE::Diskmanage::check_unused($dev);
        }
 
-       PVE::Storage::check_available($name) if $param->{add_storage};
+       PVE::Storage::assert_sid_unused($name) if $param->{add_storage};
 
        my $numdisks = scalar(@$devs);
        my $mindisks = {

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 81f9b67508538cd4de065cdda781bc0acda60aee..3b92ee3104ab671c5a5134b92adaa342d9fb15d6 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -1648,12 +1648,12 @@ sub get_bandwidth_limit {
 }
 
 # checks if the storage id is available and dies if not
-sub check_available {
-    my ($id) = @_;
+sub assert_sid_unused {
+    my ($sid) = @_;
 
     my $cfg = config();
-    if (my $scfg = storage_config($cfg, $id, 1)) {
-       die "storage ID '$id' already defined\n";
+    if (my $scfg = storage_config($cfg, $sid, 1)) {
+       die "storage ID '$sid' already defined\n";
     }
 
     return undef;