[pve-devel] [RFC qemu-server 8/9] api: importdisk: improve check if storage supports vm images

[Daniel Kral]

Adds a check in the API call `importovf` and improves the check in
`importdisk` if the target storage for the disk import supports the
content type 'images'. This will add parameter context when the check
fails and also adds a check right before allocating the disk that is
being imported.

Signed-off-by: Daniel Kral <d.kral at proxmox.com>
---
 PVE/CLI/qm.pm                | 12 ++++++------
 PVE/QemuServer/ImportDisk.pm |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index d3dbf7b4..0f62cece 100755
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -30,7 +30,7 @@ use PVE::API2::Qemu::Agent;
 use PVE::API2::Qemu;
 use PVE::QemuConfig;
 use PVE::QemuServer::Drive;
-use PVE::QemuServer::Helpers;
+use PVE::QemuServer::Helpers qw(check_storage_alloc check_volume_alloc);
 use PVE::QemuServer::Agent qw(agent_available);
 use PVE::QemuServer::ImportDisk;
 use PVE::QemuServer::Monitor qw(mon_cmd);
@@ -595,11 +595,9 @@ __PACKAGE__->register_method ({
 	die "$source: non-existent or non-regular file\n" if (! -f $source);
 
 	my $storecfg = PVE::Storage::config();
-	PVE::Storage::storage_check_enabled($storecfg, $storeid);
 
-	my $target_storage_config =  PVE::Storage::storage_config($storecfg, $storeid);
-	die "storage $storeid does not support vm images\n"
-	    if !$target_storage_config->{content}->{images};
+	eval { check_volume_alloc($storecfg, $storeid) };
+	raise_param_exc({ storage => "$@" }) if $@;
 
 	print "importing disk '$source' to VM $vmid ...\n";
 	my ($drive_id, $volid) = PVE::QemuServer::ImportDisk::do_import($source, $vmid, $storeid, { format => $format });
@@ -727,7 +725,9 @@ __PACKAGE__->register_method ({
 
 	die "$ovf_file: non-existent or non-regular file\n" if (! -f $ovf_file);
 	my $storecfg = PVE::Storage::config();
-	PVE::Storage::storage_check_enabled($storecfg, $storeid);
+
+	eval { check_volume_alloc($storecfg, $storeid) };
+	raise_param_exc({ storage => "$@" }) if $@;
 
 	my $parsed = PVE::QemuServer::OVF::parse_ovf($ovf_file);
 
diff --git a/PVE/QemuServer/ImportDisk.pm b/PVE/QemuServer/ImportDisk.pm
index 132932ae..e32b7155 100755
--- a/PVE/QemuServer/ImportDisk.pm
+++ b/PVE/QemuServer/ImportDisk.pm
@@ -5,6 +5,7 @@ use warnings;
 
 use PVE::Storage;
 use PVE::QemuServer;
+use PVE::QemuServer::Helpers qw(alloc_volume_disk);
 use PVE::Tools qw(run_command extract_param);
 
 # imports an external disk image to an existing VM
@@ -31,7 +32,8 @@ sub do_import {
     warn "format '$format' is not supported by the target storage - using '$dst_format' instead\n"
 	if $format && $format ne $dst_format;
 
-    my $dst_volid = PVE::Storage::vdisk_alloc($storecfg, $storage_id, $vmid, $dst_format, undef, $src_size / 1024);
+    my $dst_volid = alloc_volume_disk(
+	$storecfg, $storage_id, $vmid, $dst_format, undef, $src_size/1024);
 
     my $zeroinit = PVE::Storage::volume_has_feature($storecfg, 'sparseinit', $dst_volid);
 
-- 
2.39.5