[pve-devel] [PATCH qemu-server v2 12/15] api: import{disk, ovf}: use volume content type assertion helpers

[Daniel Kral]

Make use of the newly introduced content type assertion helpers in the
preconditions check paths and the call to `vdisk_alloc` in the API
handlers for importing VM disks or importing OVF manifests as VMs.

Since the preconditions existed before, adding a content type safeguard
at `vdisk_alloc` does not break the API.

Signed-off-by: Daniel Kral <d.kral at proxmox.com>
---
changes since v1:
- made it more apparent that this also affects importovf and fixed a bug
  here

 PVE/CLI/qm.pm                | 10 +++-------
 PVE/QemuServer/ImportDisk.pm |  5 +++--
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index 58167050..069d3e30 100755
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -607,10 +607,7 @@ __PACKAGE__->register_method ({
 
 	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};
+	PVE::Storage::assert_content_type_supported($storecfg, $storeid, 'images');
 
 	print "importing disk '$source' to VM $vmid ...\n";
 
@@ -756,9 +753,8 @@ __PACKAGE__->register_method ({
 
 	die "$ovf_file: non-existent or non-regular file\n" if (! -f $ovf_file);
 	my $storecfg = PVE::Storage::config();
-	my $scfg = PVE::Storage::storage_check_enabled($storecfg, $storeid);
-	raise_param_exc({ storage => "storage '$storeid' does not support vm images" })
-	   if !$scfg->{content}->{images};
+	PVE::Storage::storage_check_enabled($storecfg, $storeid);
+	PVE::Storage::assert_content_type_supported($storecfg, $storeid, 'images');
 
 	my $parsed = PVE::GuestImport::OVF::parse_ovf($ovf_file);
 
diff --git a/PVE/QemuServer/ImportDisk.pm b/PVE/QemuServer/ImportDisk.pm
index 22dbd4fc..1d28d2e1 100755
--- a/PVE/QemuServer/ImportDisk.pm
+++ b/PVE/QemuServer/ImportDisk.pm
@@ -28,8 +28,9 @@ 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, $src_size / 1024);
+    my $dst_volid = PVE::Storage::vdisk_alloc($storecfg, $storage_id, $vmid, $dst_format, $src_size / 1024, {
+	vtype => 'images',
+    });
 
     my $zeroinit = PVE::Storage::volume_has_feature($storecfg, 'sparseinit', $dst_volid);
 
-- 
2.39.5