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 F01FB60042 for ; Wed, 2 Dec 2020 11:52:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E63AF1A409 for ; Wed, 2 Dec 2020 11:51:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8964A1A3DB for ; Wed, 2 Dec 2020 11:51:32 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5236A44BDB for ; Wed, 2 Dec 2020 11:51:32 +0100 (CET) From: Thomas Lamprecht To: pve-devel@lists.proxmox.com Date: Wed, 2 Dec 2020 11:51:19 +0100 Message-Id: <20201202105122.1132809-4-t.lamprecht@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201202105122.1132809-1-t.lamprecht@proxmox.com> References: <20201202105122.1132809-1-t.lamprecht@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.077 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [scan.pm] Subject: [pve-devel] applied: [PATCH storage 3/6] api: scan: move over index and usb scan from manager 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: Wed, 02 Dec 2020 10:52:04 -0000 Add the missing pieces allowing pve-manager to just point the /nodes//scan api directory at this module, dropping it's duplicated copy. Signed-off-by: Thomas Lamprecht --- 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