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 0738096E40 for ; Tue, 16 Apr 2024 15:19:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 905621BB1A for ; Tue, 16 Apr 2024 15:19:23 +0200 (CEST) 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 for ; Tue, 16 Apr 2024 15:19:18 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 56D10451FF for ; Tue, 16 Apr 2024 15:19:15 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 15:19:02 +0200 Message-Id: <20240416131909.2867605-10-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240416131909.2867605-1-d.csapak@proxmox.com> References: <20240416131909.2867605-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.236 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 URI_NOVOWEL 0.5 URI hostname has long non-vowel sequence Subject: [pve-devel] [PATCH storage 9/9] plugin: enable import for nfs/btfs/cifs/cephfs 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: Tue, 16 Apr 2024 13:19:54 -0000 and reuse the DirPlugin implementation Signed-off-by: Dominik Csapak --- src/PVE/Storage/BTRFSPlugin.pm | 5 +++++ src/PVE/Storage/CIFSPlugin.pm | 6 +++++- src/PVE/Storage/CephFSPlugin.pm | 6 +++++- src/PVE/Storage/NFSPlugin.pm | 6 +++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/PVE/Storage/BTRFSPlugin.pm b/src/PVE/Storage/BTRFSPlugin.pm index 42815cb..b7e3f82 100644 --- a/src/PVE/Storage/BTRFSPlugin.pm +++ b/src/PVE/Storage/BTRFSPlugin.pm @@ -40,6 +40,7 @@ sub plugindata { backup => 1, snippets => 1, none => 1, + import => 1, }, { images => 1, rootdir => 1 }, ], @@ -930,4 +931,8 @@ sub volume_import { return "$storeid:$volname"; } +sub get_import_metadata { + return PVE::Storage::DirPlugin::get_import_metadata(@_); +} + 1 diff --git a/src/PVE/Storage/CIFSPlugin.pm b/src/PVE/Storage/CIFSPlugin.pm index 2184471..475065a 100644 --- a/src/PVE/Storage/CIFSPlugin.pm +++ b/src/PVE/Storage/CIFSPlugin.pm @@ -99,7 +99,7 @@ sub type { sub plugindata { return { content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, - backup => 1, snippets => 1}, { images => 1 }], + backup => 1, snippets => 1, import => 1}, { images => 1 }], format => [ { raw => 1, qcow2 => 1, vmdk => 1 } , 'raw' ], }; } @@ -314,4 +314,8 @@ sub update_volume_attribute { return PVE::Storage::DirPlugin::update_volume_attribute(@_); } +sub get_import_metadata { + return PVE::Storage::DirPlugin::get_import_metadata(@_); +} + 1; diff --git a/src/PVE/Storage/CephFSPlugin.pm b/src/PVE/Storage/CephFSPlugin.pm index 8aad518..36c64ea 100644 --- a/src/PVE/Storage/CephFSPlugin.pm +++ b/src/PVE/Storage/CephFSPlugin.pm @@ -116,7 +116,7 @@ sub type { sub plugindata { return { - content => [ { vztmpl => 1, iso => 1, backup => 1, snippets => 1}, + content => [ { vztmpl => 1, iso => 1, backup => 1, snippets => 1, import => 1 }, { backup => 1 }], }; } @@ -261,4 +261,8 @@ sub update_volume_attribute { return PVE::Storage::DirPlugin::update_volume_attribute(@_); } +sub get_import_metadata { + return PVE::Storage::DirPlugin::get_import_metadata(@_); +} + 1; diff --git a/src/PVE/Storage/NFSPlugin.pm b/src/PVE/Storage/NFSPlugin.pm index f2e4c0d..72e9c6d 100644 --- a/src/PVE/Storage/NFSPlugin.pm +++ b/src/PVE/Storage/NFSPlugin.pm @@ -53,7 +53,7 @@ sub type { sub plugindata { return { - content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1, snippets => 1 }, + content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1, snippets => 1, import => 1 }, { images => 1 }], format => [ { raw => 1, qcow2 => 1, vmdk => 1 } , 'raw' ], }; @@ -223,4 +223,8 @@ sub update_volume_attribute { return PVE::Storage::DirPlugin::update_volume_attribute(@_); } +sub get_import_metadata { + return PVE::Storage::DirPlugin::get_import_metadata(@_); +} + 1; -- 2.39.2