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 DFCB61FF2C8 for ; Wed, 17 Jul 2024 11:41:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D5B4D3821D; Wed, 17 Jul 2024 11:41:28 +0200 (CEST) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Wed, 17 Jul 2024 11:40:08 +0200 Message-Id: <20240717094034.124857-11-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240717094034.124857-1-m.carrara@proxmox.com> References: <20240717094034.124857-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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] [RFC pve-storage 10/36] api: replace usages of deprecated LVM helper subs with new ones 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" Signed-off-by: Max Carrara --- src/PVE/API2/Disks/LVM.pm | 12 ++++++------ src/PVE/API2/Disks/LVMThin.pm | 10 +++++----- src/PVE/API2/Storage/Scan.pm | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/PVE/API2/Disks/LVM.pm b/src/PVE/API2/Disks/LVM.pm index 3c5bdfa..d062758 100644 --- a/src/PVE/API2/Disks/LVM.pm +++ b/src/PVE/API2/Disks/LVM.pm @@ -3,7 +3,7 @@ package PVE::API2::Disks::LVM; use strict; use warnings; -use PVE::Storage::LVMPlugin; +use PVE::Storage::Common::LVM qw(lvm_vgs lvm_create_volume_group lvm_destroy_volume_group); use PVE::Diskmanage; use PVE::JSONSchema qw(get_standard_option); use PVE::API2::Storage::Config; @@ -91,7 +91,7 @@ __PACKAGE__->register_method ({ my $result = []; - my $vgs = PVE::Storage::LVMPlugin::lvm_vgs(1); + my $vgs = lvm_vgs(1); foreach my $vg_name (sort keys %$vgs) { my $vg = $vgs->{$vg_name}; @@ -174,14 +174,14 @@ __PACKAGE__->register_method ({ PVE::Diskmanage::locked_disk_action(sub { PVE::Diskmanage::assert_disk_unused($dev); die "volume group with name '${name}' already exists on node '${node}'\n" - if PVE::Storage::LVMPlugin::lvm_vgs()->{$name}; + if lvm_vgs()->{$name}; if (PVE::Diskmanage::is_partition($dev)) { eval { PVE::Diskmanage::change_parttype($dev, '8E00'); }; warn $@ if $@; } - PVE::Storage::LVMPlugin::lvm_create_volume_group($dev, $name); + lvm_create_volume_group($dev, $name); PVE::Diskmanage::udevadm_trigger($dev); @@ -240,10 +240,10 @@ __PACKAGE__->register_method ({ my $worker = sub { PVE::Diskmanage::locked_disk_action(sub { - my $vgs = PVE::Storage::LVMPlugin::lvm_vgs(1); + my $vgs = lvm_vgs(1); die "no such volume group '$name'\n" if !$vgs->{$name}; - PVE::Storage::LVMPlugin::lvm_destroy_volume_group($name); + lvm_destroy_volume_group($name); my $config_err; if ($param->{'cleanup-config'}) { diff --git a/src/PVE/API2/Disks/LVMThin.pm b/src/PVE/API2/Disks/LVMThin.pm index f1c3957..bd46478 100644 --- a/src/PVE/API2/Disks/LVMThin.pm +++ b/src/PVE/API2/Disks/LVMThin.pm @@ -3,7 +3,7 @@ package PVE::API2::Disks::LVMThin; use strict; use warnings; -use PVE::Storage::LvmThinPlugin; +use PVE::Storage::Common::LVM qw(lvm_vgs lvm_create_volume_group lvm_pv_info); use PVE::Diskmanage; use PVE::JSONSchema qw(get_standard_option); use PVE::API2::Storage::Config; @@ -133,15 +133,15 @@ __PACKAGE__->register_method ({ PVE::Diskmanage::assert_disk_unused($dev); die "volume group with name '${name}' already exists on node '${node}'\n" - if PVE::Storage::LVMPlugin::lvm_vgs()->{$name}; + if lvm_vgs()->{$name}; if (PVE::Diskmanage::is_partition($dev)) { eval { PVE::Diskmanage::change_parttype($dev, '8E00'); }; warn $@ if $@; } - PVE::Storage::LVMPlugin::lvm_create_volume_group($dev, $name); - my $pv = PVE::Storage::LVMPlugin::lvm_pv_info($dev); + lvm_create_volume_group($dev, $name); + my $pv = lvm_pv_info($dev); # keep some free space just in case my $datasize = $pv->{size} - 128*1024; # default to 1% for metadata @@ -241,7 +241,7 @@ __PACKAGE__->register_method ({ } if ($param->{'cleanup-disks'}) { - my $vgs = PVE::Storage::LVMPlugin::lvm_vgs(1); + my $vgs = lvm_vgs(1); die "no such volume group '$vg'\n" if !$vgs->{$vg}; die "volume group '$vg' still in use\n" if $vgs->{$vg}->{lvcount} > 0; diff --git a/src/PVE/API2/Storage/Scan.pm b/src/PVE/API2/Storage/Scan.pm index d7a8743..bad280d 100644 --- a/src/PVE/API2/Storage/Scan.pm +++ b/src/PVE/API2/Storage/Scan.pm @@ -8,7 +8,7 @@ use warnings; use PVE::JSONSchema qw(get_standard_option); use PVE::RESTHandler; use PVE::SafeSyslog; -use PVE::Storage::LVMPlugin; +use PVE::Storage::Common::LVM qw(lvm_vgs); use PVE::Storage; use PVE::SysFSTools; @@ -369,7 +369,7 @@ __PACKAGE__->register_method({ code => sub { my ($param) = @_; - my $res = PVE::Storage::LVMPlugin::lvm_vgs(); + my $res = lvm_vgs(); return PVE::RESTHandler::hash_to_array($res, 'vg'); }}); -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel