Add the missing pieces allowing pve-manager to just point the /nodes/<node>/scan api directory at this module, dropping it's duplicated copy.
Signed-off-by: Thomas Lamprecht <t.lampre...@proxmox.com> --- PVE/API2/Storage/Scan.pm | 84 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/PVE/API2/Storage/Scan.pm b/PVE/API2/Storage/Scan.pm index 44d6628..bd6c264 100644 --- a/PVE/API2/Storage/Scan.pm +++ b/PVE/API2/Storage/Scan.pm @@ -14,6 +14,46 @@ use PVE::SysFSTools; 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 => 'cifs' }, + { method => 'glusterfs' }, + { method => 'iscsi' }, + { method => 'lvm' }, + { method => 'nfs' }, + { method => 'usb' }, + { method => 'zfs' }, + ]; + + return $res; + }}); + __PACKAGE__->register_method({ name => 'nfsscan', path => 'nfs', @@ -340,3 +380,47 @@ __PACKAGE__->register_method({ return PVE::Storage::scan_zfs(); }}); + +__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'}, + class => { type => 'integer'}, + devnum => { type => 'integer'}, + level => { type => 'integer'}, + manufacturer => { type => 'string', optional => 1 }, + port => { type => 'integer'}, + prodid => { type => 'string'}, + product => { type => 'string', optional => 1 }, + serial => { type => 'string', optional => 1 }, + speed => { type => 'string'}, + usbpath => { type => 'string', optional => 1}, + vendid => { type => 'string'}, + }, + }, + }, + code => sub { + my ($param) = @_; + + return PVE::SysFSTools::scan_usb(); + }}); + +1; -- 2.20.1 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel