From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BE7DD61501 for ; Wed, 9 Feb 2022 14:08:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6189B17B2 for ; Wed, 9 Feb 2022 14:08:00 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CD4CC176A for ; Wed, 9 Feb 2022 14:07:57 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A4D764623A for ; Wed, 9 Feb 2022 14:07:57 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 9 Feb 2022 14:07:37 +0100 Message-Id: <20220209130750.902245-9-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209130750.902245-1-f.gruenbichler@proxmox.com> References: <20220209130750.902245-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.202 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v5 qemu-server 01/11] move map_storage to PVE::JSONSchema::map_id 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: , X-List-Received-Date: Wed, 09 Feb 2022 13:08:01 -0000 since we are going to reuse the same mechanism/code for network bridge mapping and pve-container. Signed-off-by: Fabian Grünbichler --- Notes: v5: move to pve-common/PVE::JSONSchema requires bumped pve-common with map_id (build and regular depends) PVE/QemuMigrate.pm | 6 +++--- PVE/QemuServer.pm | 17 +---------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index c9bc39d2..a00c2459 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -342,7 +342,7 @@ sub prepare { my $targetsid = $sid; # NOTE: we currently ignore shared source storages in mappings so skip here too for now if (!$scfg->{shared}) { - $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); + $targetsid = PVE::JSONSchema::map_id($self->{opts}->{storagemap}, $sid); } my $target_scfg = PVE::Storage::storage_check_enabled($storecfg, $targetsid, $self->{node}); @@ -408,7 +408,7 @@ sub scan_local_volumes { next if @{$dl->{$storeid}} == 0; - my $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $storeid); + my $targetsid = PVE::JSONSchema::map_id($self->{opts}->{storagemap}, $storeid); # check if storage is available on target node my $target_scfg = PVE::Storage::storage_check_enabled( $storecfg, @@ -479,7 +479,7 @@ sub scan_local_volumes { my $targetsid = $sid; # NOTE: we currently ignore shared source storages in mappings so skip here too for now if (!$scfg->{shared}) { - $targetsid = PVE::QemuServer::map_storage($self->{opts}->{storagemap}, $sid); + $targetsid = PVE::JSONSchema::map_id($self->{opts}->{storagemap}, $sid); } PVE::Storage::storage_check_enabled($storecfg, $targetsid, $self->{node}); diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 8aa19469..8c1aa30a 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -119,21 +119,6 @@ PVE::JSONSchema::register_standard_option('pve-qemu-machine', { optional => 1, }); - -sub map_storage { - my ($map, $source) = @_; - - return $source if !defined($map); - - return $map->{entries}->{$source} - if $map->{entries} && defined($map->{entries}->{$source}); - - return $map->{default} if $map->{default}; - - # identity (fallback) - return $source; -} - PVE::JSONSchema::register_standard_option('pve-targetstorage', { description => "Mapping from source to target storages. Providing only a single storage ID maps all source storages to that storage. Providing the special value '1' will map each source storage to itself.", type => 'string', @@ -5279,7 +5264,7 @@ sub vm_migrate_alloc_nbd_disks { # volume is not available there, fall back to the default format. # Otherwise use the same format as the original. if (!$storagemap->{identity}) { - $storeid = map_storage($storagemap, $storeid); + $storeid = PVE::JSONSchema::map_id($storagemap, $storeid); my ($defFormat, $validFormats) = PVE::Storage::storage_default_format($storecfg, $storeid); my $scfg = PVE::Storage::storage_config($storecfg, $storeid); my $fileFormat = qemu_img_format($scfg, $volname); -- 2.30.2