[pve-devel] [PATCH storage 2/3] remove PVE/API2/Storage/Scan.pm

Dominik Csapak d.csapak at proxmox.com
Fri Nov 16 16:17:58 CET 2018


since those are now defined in pve-manager

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 PVE/API2/Storage/Makefile |  2 +-
 PVE/API2/Storage/Scan.pm  | 97 -----------------------------------------------
 2 files changed, 1 insertion(+), 98 deletions(-)
 delete mode 100644 PVE/API2/Storage/Scan.pm

diff --git a/PVE/API2/Storage/Makefile b/PVE/API2/Storage/Makefile
index b23c17c..a33525b 100644
--- a/PVE/API2/Storage/Makefile
+++ b/PVE/API2/Storage/Makefile
@@ -1,5 +1,5 @@
 
-SOURCES= Content.pm Status.pm Config.pm Scan.pm
+SOURCES= Content.pm Status.pm Config.pm
 
 .PHONY: install
 install:
diff --git a/PVE/API2/Storage/Scan.pm b/PVE/API2/Storage/Scan.pm
deleted file mode 100644
index 4ad24a5..0000000
--- a/PVE/API2/Storage/Scan.pm
+++ /dev/null
@@ -1,97 +0,0 @@
-package PVE::API2::Storage::Scan;
-
-use strict;
-use warnings;
-
-use PVE::SafeSyslog;
-use PVE::Storage;
-use PVE::Storage::LVMPlugin;
-use HTTP::Status qw(:constants);
-use PVE::JSONSchema qw(get_standard_option);
-
-use PVE::RESTHandler;
-
-use base qw(PVE::RESTHandler);
-
-__PACKAGE__->register_method ({
-    name => 'index', 
-    path => '', 
-    method => 'GET',
-    description => "Index of available scan methods",
-    permissions => { 
-	user => 'all',
-    },
-    parameters => {
-    	additionalProperties => 0,
-	properties => {
-	    node => get_standard_option('pve-node'),
-	},
-    },
-    returns => {
-	type => 'array',
-	items => {
-	    type => "object",
-	    properties => { method => { type => 'string'} },
-	},
-	links => [ { rel => 'child', href => "{method}" } ],
-    },
-    code => sub {
-	my ($param) = @_;
-
-	my $res = [ 
-	    { method => 'lvm' },
-	    { method => 'iscsi' },
-	    { method => 'nfs' },
-	    { method => 'glusterfs' },
-	    { method => 'usb' },
-	    { method => 'zfs' },
-	    { method => 'cifs' },
-	    ];
-
-	return $res;
-    }});
-
-__PACKAGE__->register_method ({
-    name => 'usbscan', 
-    path => 'usb', 
-    method => 'GET',
-    description => "List local USB devices.",
-    protected => 1,
-    proxyto => "node",
-    permissions => { 
-	check => ['perm', '/', ['Sys.Modify']],
-    },
-    parameters => {
-    	additionalProperties => 0,
-	properties => {
-	    node => get_standard_option('pve-node'),
-	},
-    },
-    returns => {
-	type => 'array',
-	items => {
-	    type => "object",
-	    properties => { 
-		busnum => { type => 'integer'},
-		devnum => { type => 'integer'},
-		port => { type => 'integer'},
-		usbpath => { type => 'string', optional => 1},
-		level => { type => 'integer'},
-		class => { type => 'integer'},
-		vendid => { type => 'string'},
-		prodid => { type => 'string'},
-		speed => { type => 'string'},
-
-		product => { type => 'string', optional => 1 },
-		serial => { type => 'string', optional => 1 },
-		manufacturer => { type => 'string', optional => 1 },
-	    },
-	},
-    },
-    code => sub {
-	my ($param) = @_;
-
-	return PVE::Storage::scan_usb();
-    }});
-
-1;
-- 
2.11.0





More information about the pve-devel mailing list