[pve-devel] [PATCH qemu-server v3 09/12] 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.k...@proxmox.com>
---
changes since v2:
  * rename helper from *_supported to *_available
  * lower/remove storage_check_enabled to storage_config where possible
    due to the helper already checking that
  * change of vdisk_alloc signature with required $vtype
  * keep raise_param_exc for importovf, which was accidentally "lowered"
    to a die before

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

diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index afcc0243..0ecd5fcb 100755
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -606,11 +606,7 @@ __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};
+       PVE::Storage::assert_content_type_available($storecfg, $storeid, 
'images');
 
        print "importing disk '$source' to VM $vmid ...\n";
 
@@ -756,9 +752,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};
+       eval { PVE::Storage::assert_content_type_available($storecfg, $storeid, 
'images') };
+       raise_param_exc({ storage => "$@" }) if $@;
 
        my $parsed = PVE::GuestImport::OVF::parse_ovf($ovf_file);
 
diff --git a/PVE/QemuServer/ImportDisk.pm b/PVE/QemuServer/ImportDisk.pm
index 7dc25626..365f21d2 100755
--- a/PVE/QemuServer/ImportDisk.pm
+++ b/PVE/QemuServer/ImportDisk.pm
@@ -29,7 +29,7 @@ sub do_import {
        if $format && $format ne $dst_format;
 
     my $dst_volid = PVE::Storage::vdisk_alloc(
-       $storecfg, $storage_id, $vmid, $dst_format, 'any', $src_size / 1024);
+       $storecfg, $storage_id, $vmid, $dst_format, 'images', $src_size / 1024);
 
     my $zeroinit = PVE::Storage::volume_has_feature($storecfg, 'sparseinit', 
$dst_volid);
 
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel