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 5042075243 for ; Fri, 4 Jun 2021 15:50:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3FE021E0B9 for ; Fri, 4 Jun 2021 15:50:06 +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 D235B1DDA6 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 AC51246727 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:43 +0200 Message-Id: <20210604134946.152720-20-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.149 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. [ceph.pm] Subject: [pve-devel] [PATCH manager 09/12] api: ceph: remove obsoleted disks 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:08 -0000 replaced by /nodes/{node}/disks/list Signed-off-by: Fabian Ebner --- PVE/API2/Ceph.pm | 69 ------------------------------------------------ 1 file changed, 69 deletions(-) diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.pm index 3fd029cb..d6eb5563 100644 --- a/PVE/API2/Ceph.pm +++ b/PVE/API2/Ceph.pm @@ -100,7 +100,6 @@ __PACKAGE__->register_method ({ { name => 'crush' }, { name => 'config' }, { name => 'log' }, - { name => 'disks' }, # FIXME: remove with 7.0 { name => 'flags' }, # FIXME: remove with 7.0 { name => 'rules' }, ]; @@ -108,74 +107,6 @@ __PACKAGE__->register_method ({ return $result; }}); -# FIXME: Remove with PVE 7.0 -__PACKAGE__->register_method ({ - name => 'disks', - path => 'disks', - method => 'GET', - description => "List local disks.", - proxyto => 'node', - protected => 1, - permissions => { - check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1], - }, - parameters => { - additionalProperties => 0, - properties => { - node => get_standard_option('pve-node'), - type => { - description => "Only list specific types of disks.", - type => 'string', - enum => ['unused', 'journal_disks'], - optional => 1, - }, - }, - }, - returns => { - type => 'array', - items => { - type => "object", - properties => { - dev => { type => 'string' }, - used => { type => 'string', optional => 1 }, - gpt => { type => 'boolean' }, - size => { type => 'integer' }, - osdid => { type => 'integer' }, - vendor => { type => 'string', optional => 1 }, - model => { type => 'string', optional => 1 }, - serial => { type => 'string', optional => 1 }, - }, - }, - # links => [ { rel => 'child', href => "{}" } ], - }, - code => sub { - my ($param) = @_; - - PVE::Ceph::Tools::check_ceph_inited(); - - my $disks = PVE::Diskmanage::get_disks(undef, 1); - - my $res = []; - foreach my $dev (keys %$disks) { - my $d = $disks->{$dev}; - if ($param->{type}) { - if ($param->{type} eq 'journal_disks') { - next if $d->{osdid} >= 0; - next if !$d->{gpt}; - } elsif ($param->{type} eq 'unused') { - next if $d->{used}; - } else { - die "internal error"; # should not happen - } - } - - $d->{dev} = "/dev/$dev"; - push @$res, $d; - } - - return $res; - }}); - __PACKAGE__->register_method ({ name => 'config', path => 'config', -- 2.30.2