From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id C243C1FF16B for ; Thu, 14 Nov 2024 10:35:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5468E2CC48; Thu, 14 Nov 2024 10:34:16 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 14 Nov 2024 10:32:17 +0100 Message-Id: <20241114093226.814530-17-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241114093226.814530-1-d.csapak@proxmox.com> References: <20241114093226.814530-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 v5 4/4] api: create: add 'import-extraction-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 --- PVE/API2/Qemu.pm | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 5d3994aa..e8059704 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) = @_; @@ -173,9 +173,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']); + if (defined($extraction_storage)) { + my $extraction_scfg = PVE::Storage::storage_config($storecfg, $extraction_storage); + raise_param_exc({ 'import-extraction-storage' => "$extraction_storage does not support" + ." 'images' content type or is not file based."}) + if !$extraction_scfg->{content}->{images} || !$extraction_scfg->{path}; + $rpcenv->check($authuser, "/storage/$extraction_storage", ['Datastore.AllocateSpace']); + } else { + raise_param_exc({ $ds => "$src_image is not on an storage with 'images'" + ." content type and no 'import-extraction-storage' was given."}) + if !$scfg->{content}->{images}; + $rpcenv->check($authuser, "/storage/$storeid", ['Datastore.AllocateSpace']); + } } } @@ -348,7 +357,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, @@ -360,6 +369,7 @@ my sub create_disks : prototype($$$$$$$$$$) { $settings, $default_storage, $is_live_import, + $extraction_storage, ) = @_; my $vollist = []; @@ -431,8 +441,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,12 @@ __PACKAGE__->register_method({ default => 0, description => "Start VM after it was created successfully.", }, + 'import-extraction-storage' => get_standard_option('pve-storage-id', { + description => "Storage for temporarily extracted images 'import-from' image" + ." files (default: import source storage)", + optional => 1, + completion => \&PVE::QemuServer::complete_storage, + }), }, 1, # with_disk_alloc ), @@ -1006,6 +1022,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-extraction-storage'); if (defined(my $ssh_keys = $param->{sshkeys})) { $ssh_keys = URI::Escape::uri_unescape($ssh_keys); @@ -1065,7 +1082,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]); @@ -1180,6 +1198,7 @@ __PACKAGE__->register_method({ $param, $storage, $live_restore, + $extraction_storage ); $conf->{$_} = $created_opts->{$_} for keys $created_opts->%*; @@ -1722,6 +1741,8 @@ my $update_vm_api = sub { my $skip_cloud_init = extract_param($param, 'skip_cloud_init'); + my $extraction_storage = extract_param($param, 'import-extraction-storage'); + my @paramarr = (); # used for log message foreach my $key (sort keys %$param) { my $value = $key eq 'cipassword' ? '' : $param->{$key}; @@ -1835,7 +1856,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); @@ -2018,6 +2039,7 @@ my $update_vm_api = sub { {$opt => $param->{$opt}}, undef, undef, + $extraction_storage, ); $conf->{pending}->{$_} = $created_opts->{$_} for keys $created_opts->%*; @@ -2220,6 +2242,12 @@ __PACKAGE__->register_method({ maximum => 30, optional => 1, }, + 'import-extraction-storage' => get_standard_option('pve-storage-id', { + description => "Storage for temporarily extracted images 'import-from' image" + ." files (default: import 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