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

rename check_available to assert_sid_unused

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2018-10-03 14:49:14 +02:00
parent 4dcb16c0dc
commit 9280153e10
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/Disks/Directory.pm
View File

@ -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";

2
PVE/API2/Disks/LVM.pm
View File

@ -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 {

2
PVE/API2/Disks/LVMThin.pm
View File

@ -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 {

2
PVE/API2/Disks/ZFS.pm
View File

@ -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 = {

8
PVE/Storage.pm
View File

@ -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;