[pve-devel] [PATCH container v3 09/11] migration: prepare: use volume content type assertion helpers

[Daniel Kral <d.kral@proxmox.com>]

Make use of newly introduced content type assertion helpers in the
preconditions check and preparation path of the migration API handlers.

Signed-off-by: Daniel Kral <d.kral@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

 src/PVE/API2/LXC.pm    |  7 +------
 src/PVE/LXC/Migrate.pm | 14 ++++++--------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 947021a..73e1bf4 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -54,13 +54,8 @@ my sub assert_not_restore_from_external {
 my $check_storage_access_migrate = sub {
     my ($rpcenv, $authuser, $storecfg, $storage, $node) = @_;
 
-    PVE::Storage::storage_check_enabled($storecfg, $storage, $node);
-
     $rpcenv->check($authuser, "/storage/$storage", ['Datastore.AllocateSpace']);
-
-    my $scfg = PVE::Storage::storage_config($storecfg, $storage);
-    die "storage '$storage' does not support CT rootdirs\n"
-	if !$scfg->{content}->{rootdir};
+    PVE::Storage::assert_content_type_available($storecfg, $storage, 'rootdir', $node);
 };
 
 __PACKAGE__->register_method ({
diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm
index f06a10a..adb8fad 100644
--- a/src/PVE/LXC/Migrate.pm
+++ b/src/PVE/LXC/Migrate.pm
@@ -72,13 +72,11 @@ sub prepare {
 
 	# check if storage is available on both nodes
 	my ($storecfg, $node) = $self->@{qw(storecfg node)};
-	my $scfg = PVE::Storage::storage_check_enabled($storecfg, $storage);
+	my $scfg = PVE::Storage::storage_config($storecfg, $storage);
+	PVE::Storage::assert_content_type_available($storecfg, $storage, 'rootdir');
 
 	my $targetsid = $storage;
 
-	die "content type 'rootdir' is not available on storage '$storage'\n"
-	    if !$scfg->{content}->{rootdir};
-
 	if ($scfg->{shared} && !$remote) {
 	    # PVE::Storage::activate_storage checks this for non-shared storages
 	    my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
@@ -93,10 +91,10 @@ sub prepare {
 	}
 
 	if (!$remote) {
-	    my $target_scfg = PVE::Storage::storage_check_enabled($storecfg, $targetsid, $node);
-
-	    die "$volid: content type 'rootdir' is not available on storage '$targetsid'\n"
-		if !$target_scfg->{content}->{rootdir};
+	    eval {
+		PVE::Storage::assert_content_type_available($storecfg, $targetsid, 'rootdir', $node)
+	    };
+	    die "$volid: $@" if $@;
 	}
 
 	$storages->{$targetsid} = 1;
-- 
2.39.5



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