[pve-devel] [PATCH v2 storage 2/2] pvesm: using $API instead of PVE::API2::Storage

Lorenz Stechauner l.stechauner at proxmox.com
Tue Sep 28 08:32:32 CEST 2021


Signed-off-by: Lorenz Stechauner <l.stechauner at proxmox.com>
---
 PVE/CLI/pvesm.pm | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/PVE/CLI/pvesm.pm b/PVE/CLI/pvesm.pm
index 6c0a1b2..28be91c 100755
--- a/PVE/CLI/pvesm.pm
+++ b/PVE/CLI/pvesm.pm
@@ -511,43 +511,45 @@ my $print_api_result = sub {
     PVE::CLIFormatter::print_api_result($data, $schema, undef, $options);
 };
 
+my $API = 'PVE::API2::Storage';
+
 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 },
+    add => [ "${API}::Config", 'create', ['type', 'storage'] ],
+    set => [ "${API}::Config", 'update', ['storage'] ],
+    remove => [ "${API}::Config", 'delete', ['storage'] ],
+    status => [ "${API}::Status", 'index', [], { node => $nodename },
 	        $print_api_result, $PVE::RESTHandler::standard_output_options ],
-    list => [ "PVE::API2::Storage::Content", 'index', ['storage'], { node => $nodename },
+    list => [ "${API}::Content", 'index', ['storage'], { node => $nodename },
 	      $print_api_result, $PVE::RESTHandler::standard_output_options ],
-    alloc => [ "PVE::API2::Storage::Content", 'create', ['storage', 'vmid', 'filename', 'size'],
+    alloc => [ "${API}::Content", 'create', ['storage', 'vmid', 'filename', 'size'],
 	       { node => $nodename }, sub {
 		   my $volid = shift;
 		   print "successfully created '$volid'\n";
 	       }],
-    free => [ "PVE::API2::Storage::Content", 'delete', ['volume'],
+    free => [ "${API}::Content", 'delete', ['volume'],
 	      { node => $nodename } ],
     scan => {
-	nfs => [ "PVE::API2::Storage::Scan", 'nfsscan', ['server'], { node => $nodename },
+	nfs => [ "${API}::Scan", 'nfsscan', ['server'], { node => $nodename },
 		 $print_api_result, $PVE::RESTHandler::standard_output_options ],
-	cifs => [ "PVE::API2::Storage::Scan", 'cifsscan', ['server'], { node => $nodename },
+	cifs => [ "${API}::Scan", 'cifsscan', ['server'], { node => $nodename },
 		  $print_api_result, $PVE::RESTHandler::standard_output_options ],
-	glusterfs => [ "PVE::API2::Storage::Scan", 'glusterfsscan', ['server'], { node => $nodename },
+	glusterfs => [ "${API}::Scan", 'glusterfsscan', ['server'], { node => $nodename },
 		       $print_api_result, $PVE::RESTHandler::standard_output_options ],
-	iscsi => [ "PVE::API2::Storage::Scan", 'iscsiscan', ['portal'], { node => $nodename },
+	iscsi => [ "${API}::Scan", 'iscsiscan', ['portal'], { node => $nodename },
 		   $print_api_result, $PVE::RESTHandler::standard_output_options ],
-	lvm => [ "PVE::API2::Storage::Scan", 'lvmscan', [], { node => $nodename },
+	lvm => [ "${API}::Scan", 'lvmscan', [], { node => $nodename },
 		 $print_api_result, $PVE::RESTHandler::standard_output_options ],
-	lvmthin => [ "PVE::API2::Storage::Scan", 'lvmthinscan', ['vg'], { node => $nodename },
+	lvmthin => [ "${API}::Scan", 'lvmthinscan', ['vg'], { node => $nodename },
 		     $print_api_result, $PVE::RESTHandler::standard_output_options ],
 	pbs => [
-	    "PVE::API2::Storage::Scan",
+	    "${API}::Scan",
 	    'pbsscan',
 	    ['server', 'username'],
 	    { node => $nodename },
 	    $print_api_result,
 	    $PVE::RESTHandler::standard_output_options,
 	],
-	zfs => [ "PVE::API2::Storage::Scan", 'zfsscan', [], { node => $nodename },
+	zfs => [ "${API}::Scan", 'zfsscan', [], { node => $nodename },
 		 $print_api_result, $PVE::RESTHandler::standard_output_options ],
     },
     nfsscan => { alias => 'scan nfs' },
-- 
2.30.2





More information about the pve-devel mailing list