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 0E51C613AA for ; Tue, 25 Jul 2023 16:37:29 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EBCFF1C162 for ; Tue, 25 Jul 2023 16:37:28 +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, 25 Jul 2023 16:37:28 +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 D53A244262 for ; Tue, 25 Jul 2023 16:37:27 +0200 (CEST) From: Philipp Hufnagl To: pve-devel@lists.proxmox.com Date: Tue, 25 Jul 2023 16:37:19 +0200 Message-Id: <20230725143720.620577-3-p.hufnagl@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230725143720.620577-1-p.hufnagl@proxmox.com> References: <20230725143720.620577-1-p.hufnagl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-storage 2/2] clean: fix whitspaces and minor code issues 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, 25 Jul 2023 14:37:29 -0000 removed Data::Dumper and a newline Signed-off-by: Philipp Hufnagl --- src/PVE/API2/Storage/Status.pm | 18 +++++------ src/PVE/Storage.pm | 55 +++++++++++++++++----------------- src/PVE/Storage/Plugin.pm | 3 +- 3 files changed, 37 insertions(+), 39 deletions(-) diff --git a/src/PVE/API2/Storage/Status.pm b/src/PVE/API2/Storage/Status.pm index 9ac4660..51e519e 100644 --- a/src/PVE/API2/Storage/Status.pm +++ b/src/PVE/API2/Storage/Status.pm @@ -53,7 +53,7 @@ __PACKAGE__->register_method ({ protected => 1, proxyto => 'node', parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), storage => get_standard_option('pve-storage-id', { @@ -204,7 +204,7 @@ __PACKAGE__->register_method ({ check => ['perm', '/storage/{storage}', ['Datastore.Audit', 'Datastore.AllocateSpace'], any => 1], }, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), storage => get_standard_option('pve-storage-id'), @@ -248,7 +248,7 @@ __PACKAGE__->register_method ({ protected => 1, proxyto => 'node', parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), storage => get_standard_option('pve-storage-id'), @@ -284,7 +284,7 @@ __PACKAGE__->register_method ({ protected => 1, proxyto => 'node', parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), storage => get_standard_option('pve-storage-id'), @@ -295,11 +295,11 @@ __PACKAGE__->register_method ({ }, ds => { description => "The list of datasources you want to display.", - type => 'string', format => 'pve-configid-list', + type => 'string', format => 'pve-configid-list', }, cf => { description => "The RRD consolidation function", - type => 'string', + type => 'string', enum => [ 'AVERAGE', 'MAX' ], optional => 1, }, @@ -330,7 +330,7 @@ __PACKAGE__->register_method ({ protected => 1, proxyto => 'node', parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), storage => get_standard_option('pve-storage-id'), @@ -341,7 +341,7 @@ __PACKAGE__->register_method ({ }, cf => { description => "The RRD consolidation function", - type => 'string', + type => 'string', enum => [ 'AVERAGE', 'MAX' ], optional => 1, }, @@ -374,7 +374,7 @@ __PACKAGE__->register_method ({ }, protected => 1, parameters => { - additionalProperties => 0, + additionalProperties => 0, properties => { node => get_standard_option('pve-node'), storage => get_standard_option('pve-storage-id'), diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm index 0c62cc8..4f72790 100755 --- a/src/PVE/Storage.pm +++ b/src/PVE/Storage.pm @@ -2,7 +2,6 @@ package PVE::Storage; use strict; use warnings; -use Data::Dumper; use POSIX; use IO::Select; @@ -304,11 +303,11 @@ sub volume_resize { my ($storeid, $volname) = parse_volume_id($volid, 1); if ($storeid) { - my $scfg = storage_config($cfg, $storeid); - my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); - return $plugin->volume_resize($scfg, $storeid, $volname, $size, $running); + my $scfg = storage_config($cfg, $storeid); + my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); + return $plugin->volume_resize($scfg, $storeid, $volname, $size, $running); } elsif ($volid =~ m|^(/.+)$| && -e $volid) { - die "resize file/device '$volid' is not possible\n"; + die "resize file/device '$volid' is not possible\n"; } else { die "unable to parse volume ID '$volid'\n"; } @@ -319,11 +318,11 @@ sub volume_rollback_is_possible { my ($storeid, $volname) = parse_volume_id($volid, 1); if ($storeid) { - my $scfg = storage_config($cfg, $storeid); - my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); - return $plugin->volume_rollback_is_possible($scfg, $storeid, $volname, $snap, $blockers); + my $scfg = storage_config($cfg, $storeid); + my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); + return $plugin->volume_rollback_is_possible($scfg, $storeid, $volname, $snap, $blockers); } elsif ($volid =~ m|^(/.+)$| && -e $volid) { - die "snapshot rollback file/device '$volid' is not possible\n"; + die "snapshot rollback file/device '$volid' is not possible\n"; } else { die "unable to parse volume ID '$volid'\n"; } @@ -334,11 +333,11 @@ sub volume_snapshot { my ($storeid, $volname) = parse_volume_id($volid, 1); if ($storeid) { - my $scfg = storage_config($cfg, $storeid); - my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); - return $plugin->volume_snapshot($scfg, $storeid, $volname, $snap); + my $scfg = storage_config($cfg, $storeid); + my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); + return $plugin->volume_snapshot($scfg, $storeid, $volname, $snap); } elsif ($volid =~ m|^(/.+)$| && -e $volid) { - die "snapshot file/device '$volid' is not possible\n"; + die "snapshot file/device '$volid' is not possible\n"; } else { die "unable to parse volume ID '$volid'\n"; } @@ -349,12 +348,12 @@ sub volume_snapshot_rollback { my ($storeid, $volname) = parse_volume_id($volid, 1); if ($storeid) { - my $scfg = storage_config($cfg, $storeid); - my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); + my $scfg = storage_config($cfg, $storeid); + my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); $plugin->volume_rollback_is_possible($scfg, $storeid, $volname, $snap); - return $plugin->volume_snapshot_rollback($scfg, $storeid, $volname, $snap); + return $plugin->volume_snapshot_rollback($scfg, $storeid, $volname, $snap); } elsif ($volid =~ m|^(/.+)$| && -e $volid) { - die "snapshot rollback file/device '$volid' is not possible\n"; + die "snapshot rollback file/device '$volid' is not possible\n"; } else { die "unable to parse volume ID '$volid'\n"; } @@ -366,11 +365,11 @@ sub volume_snapshot_delete { my ($storeid, $volname) = parse_volume_id($volid, 1); if ($storeid) { - my $scfg = storage_config($cfg, $storeid); - my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); - return $plugin->volume_snapshot_delete($scfg, $storeid, $volname, $snap, $running); + my $scfg = storage_config($cfg, $storeid); + my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); + return $plugin->volume_snapshot_delete($scfg, $storeid, $volname, $snap, $running); } elsif ($volid =~ m|^(/.+)$| && -e $volid) { - die "snapshot delete file/device '$volid' is not possible\n"; + die "snapshot delete file/device '$volid' is not possible\n"; } else { die "unable to parse volume ID '$volid'\n"; } @@ -409,9 +408,9 @@ sub volume_has_feature { my ($storeid, $volname) = parse_volume_id($volid, 1); if ($storeid) { - my $scfg = storage_config($cfg, $storeid); - my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); - return $plugin->volume_has_feature($scfg, $feature, $storeid, $volname, $snap, $running, $opts); + my $scfg = storage_config($cfg, $storeid); + my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); + return $plugin->volume_has_feature($scfg, $feature, $storeid, $volname, $snap, $running, $opts); } elsif ($volid =~ m|^(/.+)$| && -e $volid) { return undef; } else { @@ -1503,7 +1502,7 @@ sub foreach_volid { foreach my $sid (keys %$list) { foreach my $info (@{$list->{$sid}}) { - my $volid = $info->{volid}; + my $volid = $info->{volid}; my ($sid1, $volname) = parse_volume_id($volid, 1); if ($sid1 && $sid1 eq $sid) { &$func ($volid, $sid, $info); @@ -1849,7 +1848,7 @@ sub volume_export : prototype($$$$$$$) { my $scfg = storage_config($cfg, $storeid); my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); return $plugin->volume_export($scfg, $storeid, $fh, $volname, $format, - $snapshot, $base_snapshot, $with_snapshots); + $snapshot, $base_snapshot, $with_snapshots); } sub volume_import : prototype($$$$$$$$) { @@ -1880,8 +1879,8 @@ sub volume_export_formats : prototype($$$$$) { my $scfg = storage_config($cfg, $storeid); my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); return $plugin->volume_export_formats($scfg, $storeid, $volname, - $snapshot, $base_snapshot, - $with_snapshots); + $snapshot, $base_snapshot, + $with_snapshots); } sub volume_import_formats : prototype($$$$$) { diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm index 9d3b1ae..2e75a2b 100644 --- a/src/PVE/Storage/Plugin.pm +++ b/src/PVE/Storage/Plugin.pm @@ -1226,8 +1226,7 @@ my $get_subdir_files = sub { if ($tt eq 'iso') { next if $fn !~ m!/([^/]+$PVE::Storage::ISO_EXT_RE_0)$!i; - - $info = { volid => "$sid:iso/$1", format => 'iso' }; + $info = { volid => "$sid:iso/$1", format => 'iso' }; } elsif ($tt eq 'vztmpl') { next if $fn !~ m!/([^/]+$PVE::Storage::VZTMPL_EXT_RE_1)$!; -- 2.39.2