From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 026B61FF15F for ; Mon, 18 Nov 2024 16:32:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D81B613BE3; Mon, 18 Nov 2024 16:30:13 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 18 Nov 2024 16:29:18 +0100 Message-Id: <20241118152928.858590-16-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241118152928.858590-1-d.csapak@proxmox.com> References: <20241118152928.858590-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server v7 4/5] api: create: add 'import-working-storage' parameter X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" this is to override the target extraction storage for the option disk extraction for 'import-from'. This way if the storage does not supports the content type 'images', one can give an alternative one. Signed-off-by: Dominik Csapak --- changes from v6: * rename 'import-extraction-storage' to 'import-working-storage' * rework permission checks (single branch) i opted to not make the target the first default, since i did not want to introduce such a change this late in the patch/review cycle and AFAICS quite a few code changes would have been necessary for that (we can still change that later too) PVE/API2/Qemu.pm | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index c947f09c..701558a7 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -132,7 +132,7 @@ my $check_drive_param = sub { }; my $check_storage_access = sub { - my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage) = @_; + my ($rpcenv, $authuser, $storecfg, $vmid, $settings, $default_storage, $extraction_storage) = @_; $foreach_volume_with_alloc->($settings, sub { my ($ds, $drive) = @_; @@ -174,9 +174,18 @@ my $check_storage_access = sub { if $vtype ne 'images' && $vtype ne 'import'; if (PVE::QemuServer::Helpers::needs_extraction($vtype, $fmt)) { - raise_param_exc({ $ds => "$src_image is not on an storage with 'images' content type."}) - if !$scfg->{content}->{images}; - $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']); + my $extraction_scfg = defined($extraction_storage) ? + PVE::Storage::storage_config($storecfg, $extraction_storage) : + $scfg; + my $extraction_param = defined($extraction_storage) ? 'import-working-storage' : $ds; + + if (!$extraction_scfg->{content}->{images} || !$extraction_scfg->{path}) { + raise_param_exc({ + $extraction_param => "storage selected for extraction does not support" + ." 'images' content type or is not file based.", + }); + } + $rpcenv->check($authuser, "/storage/" . ($extraction_storage // $storeid), ['Datastore.AllocateSpace']); } } @@ -349,7 +358,7 @@ my sub prohibit_tpm_version_change { # Note: $pool is only needed when creating a VM, because pool permissions # are automatically inherited if VM already exists inside a pool. -my sub create_disks : prototype($$$$$$$$$$) { +my sub create_disks : prototype($$$$$$$$$$$) { my ( $rpcenv, $authuser, @@ -361,6 +370,7 @@ my sub create_disks : prototype($$$$$$$$$$) { $settings, $default_storage, $is_live_import, + $extraction_storage, ) = @_; my $vollist = []; @@ -432,8 +442,8 @@ my sub create_disks : prototype($$$$$$$$$$) { my $needs_extraction = PVE::QemuServer::Helpers::needs_extraction($vtype, $fmt); if ($needs_extraction) { print "extracting $source\n"; - my $extracted_volid - = PVE::GuestImport::extract_disk_from_import_file($source, $vmid); + my $extracted_volid = PVE::GuestImport::extract_disk_from_import_file( + $source, $vmid, $extraction_storage); print "finished extracting to $extracted_volid\n"; push @$vollist, $extracted_volid; $source = $extracted_volid; @@ -980,6 +990,13 @@ __PACKAGE__->register_method({ default => 0, description => "Start VM after it was created successfully.", }, + 'import-working-storage' => get_standard_option('pve-storage-id', { + description => "A file-based storage with 'images' content-type enabled, which" + ." is used as an intermediary extraction storage during import. Defaults to" + ." the source storage.", + optional => 1, + completion => \&PVE::QemuServer::complete_storage, + }), }, 1, # with_disk_alloc ), @@ -1006,6 +1023,7 @@ __PACKAGE__->register_method({ my $storage = extract_param($param, 'storage'); my $unique = extract_param($param, 'unique'); my $live_restore = extract_param($param, 'live-restore'); + my $extraction_storage = extract_param($param, 'import-working-storage'); if (defined(my $ssh_keys = $param->{sshkeys})) { $ssh_keys = URI::Escape::uri_unescape($ssh_keys); @@ -1068,7 +1086,8 @@ __PACKAGE__->register_method({ if (scalar(keys $param->%*) > 0) { &$resolve_cdrom_alias($param); - &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param, $storage); + &$check_storage_access( + $rpcenv, $authuser, $storecfg, $vmid, $param, $storage, $extraction_storage); &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, $pool, [ keys %$param]); @@ -1183,6 +1202,7 @@ __PACKAGE__->register_method({ $param, $storage, $live_restore, + $extraction_storage ); $conf->{$_} = $created_opts->{$_} for keys $created_opts->%*; @@ -1725,6 +1745,8 @@ my $update_vm_api = sub { my $skip_cloud_init = extract_param($param, 'skip_cloud_init'); + my $extraction_storage = extract_param($param, 'import-working-storage'); + my @paramarr = (); # used for log message foreach my $key (sort keys %$param) { my $value = $key eq 'cipassword' ? '' : $param->{$key}; @@ -1841,7 +1863,7 @@ my $update_vm_api = sub { &$check_vm_modify_config_perm($rpcenv, $authuser, $vmid, undef, [keys %$param]); - &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param); + &$check_storage_access($rpcenv, $authuser, $storecfg, $vmid, $param, undef, $extraction_storage); PVE::QemuServer::check_bridge_access($rpcenv, $authuser, $param); @@ -2025,6 +2047,7 @@ my $update_vm_api = sub { {$opt => $param->{$opt}}, undef, undef, + $extraction_storage, ); $conf->{pending}->{$_} = $created_opts->{$_} for keys $created_opts->%*; @@ -2227,6 +2250,13 @@ __PACKAGE__->register_method({ maximum => 30, optional => 1, }, + 'import-working-storage' => get_standard_option('pve-storage-id', { + description => "A file-based storage with 'images' content-type enabled, which" + ." is used as an intermediary extraction storage during import. Defaults to" + ." the source storage.", + optional => 1, + completion => \&PVE::QemuServer::complete_storage, + }), }, 1, # with_disk_alloc ), -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel