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 3A3B3751B1 for ; Fri, 4 Jun 2021 15:50:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0E88D1DF2A for ; Fri, 4 Jun 2021 15:50:02 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id 642FC1DD9D for ; Fri, 4 Jun 2021 15:49:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 28FCF4673B for ; Fri, 4 Jun 2021 15:49:51 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 4 Jun 2021 15:49:33 +0200 Message-Id: <20210604134946.152720-10-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210604134946.152720-1-f.ebner@proxmox.com> References: <20210604134946.152720-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.169 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes 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] [PATCH storage 3/3] api: get rid of moved 'usb' call 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: Fri, 04 Jun 2021 13:50:02 -0000 pve-manger commit bd328734deb1dcea296858bb38d085e392adb99e changed the frontend to use the new call. Signed-off-by: Fabian Ebner --- PVE/API2/Storage/Scan.pm | 45 ---------------------------------------- 1 file changed, 45 deletions(-) diff --git a/PVE/API2/Storage/Scan.pm b/PVE/API2/Storage/Scan.pm index 15b39b5..d7a8743 100644 --- a/PVE/API2/Storage/Scan.pm +++ b/PVE/API2/Storage/Scan.pm @@ -48,8 +48,6 @@ __PACKAGE__->register_method({ { method => 'lvm' }, { method => 'nfs' }, { method => 'pbs' }, - # FIXME: remove with 7.0 (replaced by /nodes//hardware/usb) - { method => 'usb' }, { method => 'zfs' }, ]; @@ -448,47 +446,4 @@ __PACKAGE__->register_method({ return PVE::Storage::scan_zfs(); }}); -# FIXME: remove with 7.0 (replaced by /nodes//hardware/usb) -__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.30.2