all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Lorenz Stechauner <l.stechauner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v3 storage 1/2] fix #3633: pvesm: use print_api_result
Date: Thu, 21 Oct 2021 14:49:18 +0200	[thread overview]
Message-ID: <20211021124919.87618-1-l.stechauner@proxmox.com> (raw)

Signed-off-by: Lorenz Stechauner <l.stechauner@proxmox.com>
---
 PVE/CLI/pvesm.pm | 158 +++++++++--------------------------------------
 1 file changed, 30 insertions(+), 128 deletions(-)

diff --git a/PVE/CLI/pvesm.pm b/PVE/CLI/pvesm.pm
index 190de91..94847cd 100755
--- a/PVE/CLI/pvesm.pm
+++ b/PVE/CLI/pvesm.pm
@@ -178,68 +178,6 @@ __PACKAGE__->register_method ({
 	return;
     }});
 
-my $print_content = sub {
-    my ($list) = @_;
-
-    my ($maxlenname, $maxsize) = (0, 0);
-    foreach my $info (@$list) {
-	my $volid = $info->{volid};
-	my $sidlen =  length ($volid);
-	$maxlenname = $sidlen if $sidlen > $maxlenname;
-	$maxsize = $info->{size} if ($info->{size} // 0) > $maxsize;
-    }
-    my $sizemaxdigits = length($maxsize);
-
-    my $basefmt = "%-${maxlenname}s %-7s %-9s %${sizemaxdigits}s";
-    printf "$basefmt %s\n", "Volid", "Format", "Type", "Size", "VMID";
-
-    foreach my $info (@$list) {
-	next if !$info->{vmid};
-	my $volid = $info->{volid};
-
-	printf "$basefmt %d\n", $volid, $info->{format}, $info->{content}, $info->{size}, $info->{vmid};
-    }
-
-    foreach my $info (sort { $a->{format} cmp $b->{format} } @$list) {
-	next if $info->{vmid};
-	my $volid = $info->{volid};
-
-	printf "$basefmt\n", $volid, $info->{format}, $info->{content}, $info->{size};
-    }
-};
-
-my $print_status = sub {
-    my $res = shift;
-
-    my $maxlen = 0;
-    foreach my $res (@$res) {
-	my $storeid = $res->{storage};
-	$maxlen = length ($storeid) if length ($storeid) > $maxlen;
-    }
-    $maxlen+=1;
-
-    printf "%-${maxlen}s %10s %10s %15s %15s %15s %8s\n", 'Name', 'Type',
-	'Status', 'Total', 'Used', 'Available', '%';
-
-    foreach my $res (sort { $a->{storage} cmp $b->{storage} } @$res) {
-	my $storeid = $res->{storage};
-
-	my $active = $res->{active} ? 'active' : 'inactive';
-	my ($per, $per_fmt) = (0, '% 7.2f%%');
-	$per = ($res->{used}*100)/$res->{total} if $res->{total} > 0;
-
-	if (!$res->{enabled}) {
-	    $per = 'N/A';
-	    $per_fmt = '% 8s';
-	    $active = 'disabled';
-	}
-
-	printf "%-${maxlen}s %10s %10s %15d %15d %15d $per_fmt\n", $storeid,
-	    $res->{type}, $active, $res->{total}/1024, $res->{used}/1024,
-	    $res->{avail}/1024, $per;
-    }
-};
-
 __PACKAGE__->register_method ({
     name => 'export',
     path => 'export',
@@ -573,14 +511,26 @@ my $print_api_result = sub {
     PVE::CLIFormatter::print_api_result($data, $schema, undef, $options);
 };
 
+my $print_content = sub {
+    my ($data, $schema, $options) = @_;
+    my $order = [qw(volid format content size used vmid ctime parent encrypted verification notes)];
+    PVE::CLIFormatter::print_api_result($data, $schema, $order, $options);
+};
+
+my $print_status = sub {
+    my ($data, $schema, $options) = @_;
+    my $order = [qw(storage type active enabled shared total used avail used_fraction content)];
+    PVE::CLIFormatter::print_api_result($data, $schema, $order, $options);
+};
+
 our $cmddef = {
     add => [ "PVE::API2::Storage::Config", 'create', ['type', 'storage'] ],
     set => [ "PVE::API2::Storage::Config", 'update', ['storage'] ],
     remove => [ "PVE::API2::Storage::Config", 'delete', ['storage'] ],
-    status => [ "PVE::API2::Storage::Status", 'index', [],
-		{ node => $nodename }, $print_status ],
-    list => [ "PVE::API2::Storage::Content", 'index', ['storage'],
-	      { node => $nodename }, $print_content ],
+    status => [ "PVE::API2::Storage::Status", 'index', [], { node => $nodename },
+	        $print_status, $PVE::RESTHandler::standard_output_options ],
+    list => [ "PVE::API2::Storage::Content", 'index', ['storage'], { node => $nodename },
+	      $print_content, $PVE::RESTHandler::standard_output_options ],
     alloc => [ "PVE::API2::Storage::Content", 'create', ['storage', 'vmid', 'filename', 'size'],
 	       { node => $nodename }, sub {
 		   my $volid = shift;
@@ -589,61 +539,18 @@ our $cmddef = {
     free => [ "PVE::API2::Storage::Content", 'delete', ['volume'],
 	      { node => $nodename } ],
     scan => {
-	nfs => [ "PVE::API2::Storage::Scan", 'nfsscan', ['server'], { node => $nodename }, sub  {
-	    my $res = shift;
-
-	    my $maxlen = 0;
-	    foreach my $rec (@$res) {
-		my $len = length ($rec->{path});
-		$maxlen = $len if $len > $maxlen;
-	    }
-	    foreach my $rec (@$res) {
-		printf "%-${maxlen}s %s\n", $rec->{path}, $rec->{options};
-	    }
-	}],
-	cifs => [ "PVE::API2::Storage::Scan", 'cifsscan', ['server'], { node => $nodename }, sub  {
-	    my $res = shift;
-
-	    my $maxlen = 0;
-	    foreach my $rec (@$res) {
-		my $len = length ($rec->{share});
-		$maxlen = $len if $len > $maxlen;
-	    }
-	    foreach my $rec (@$res) {
-		printf "%-${maxlen}s %s\n", $rec->{share}, $rec->{description};
-	    }
-	}],
-	glusterfs => [ "PVE::API2::Storage::Scan", 'glusterfsscan', ['server'], { node => $nodename }, sub  {
-	    my $res = shift;
-
-	    foreach my $rec (@$res) {
-		printf "%s\n", $rec->{volname};
-	    }
-	}],
-	iscsi => [ "PVE::API2::Storage::Scan", 'iscsiscan', ['portal'], { node => $nodename }, sub  {
-	    my $res = shift;
-
-	    my $maxlen = 0;
-	    foreach my $rec (@$res) {
-		my $len = length ($rec->{target});
-		$maxlen = $len if $len > $maxlen;
-	    }
-	    foreach my $rec (@$res) {
-		printf "%-${maxlen}s %s\n", $rec->{target}, $rec->{portal};
-	    }
-	}],
-	lvm => [ "PVE::API2::Storage::Scan", 'lvmscan', [], { node => $nodename }, sub  {
-	    my $res = shift;
-	    foreach my $rec (@$res) {
-		printf "$rec->{vg}\n";
-	    }
-	}],
-	lvmthin => [ "PVE::API2::Storage::Scan", 'lvmthinscan', ['vg'], { node => $nodename }, sub  {
-	    my $res = shift;
-	    foreach my $rec (@$res) {
-		printf "$rec->{lv}\n";
-	    }
-	}],
+	nfs => [ "PVE::API2::Storage::Scan", 'nfsscan', ['server'], { node => $nodename },
+		 $print_api_result, $PVE::RESTHandler::standard_output_options ],
+	cifs => [ "PVE::API2::Storage::Scan", 'cifsscan', ['server'], { node => $nodename },
+		  $print_api_result, $PVE::RESTHandler::standard_output_options ],
+	glusterfs => [ "PVE::API2::Storage::Scan", 'glusterfsscan', ['server'], { node => $nodename },
+		       $print_api_result, $PVE::RESTHandler::standard_output_options ],
+	iscsi => [ "PVE::API2::Storage::Scan", 'iscsiscan', ['portal'], { node => $nodename },
+		   $print_api_result, $PVE::RESTHandler::standard_output_options ],
+	lvm => [ "PVE::API2::Storage::Scan", 'lvmscan', [], { node => $nodename },
+		 $print_api_result, $PVE::RESTHandler::standard_output_options ],
+	lvmthin => [ "PVE::API2::Storage::Scan", 'lvmthinscan', ['vg'], { node => $nodename },
+		     $print_api_result, $PVE::RESTHandler::standard_output_options ],
 	pbs => [
 	    "PVE::API2::Storage::Scan",
 	    'pbsscan',
@@ -652,13 +559,8 @@ our $cmddef = {
 	    $print_api_result,
 	    $PVE::RESTHandler::standard_output_options,
 	],
-	zfs => [ "PVE::API2::Storage::Scan", 'zfsscan', [], { node => $nodename }, sub  {
-	    my $res = shift;
-
-	    foreach my $rec (@$res) {
-		 printf "$rec->{pool}\n";
-	    }
-	}],
+	zfs => [ "PVE::API2::Storage::Scan", 'zfsscan', [], { node => $nodename },
+		 $print_api_result, $PVE::RESTHandler::standard_output_options ],
     },
     nfsscan => { alias => 'scan nfs' },
     cifsscan => { alias => 'scan cifs' },
-- 
2.30.2





             reply	other threads:[~2021-10-21 12:49 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-21 12:49 Lorenz Stechauner [this message]
2021-10-21 12:49 ` [pve-devel] [PATCH v3 storage 2/2] pvesm: using $API instead of PVE::API2::Storage Lorenz Stechauner
2021-10-21 12:50 ` [pve-devel] [PATCH v3 storage 1/2] fix #3633: pvesm: use print_api_result Lorenz Stechauner
2021-10-25 14:17 ` Dominik Csapak
2021-10-27  9:55   ` Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211021124919.87618-1-l.stechauner@proxmox.com \
    --to=l.stechauner@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal