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 8270B91B53 for ; Fri, 23 Dec 2022 10:59:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 58F9623927 for ; Fri, 23 Dec 2022 10:59:19 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 23 Dec 2022 10:59:16 +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 A6678448BE for ; Fri, 23 Dec 2022 10:59:16 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Fri, 23 Dec 2022 10:59:14 +0100 Message-Id: <20221223095915.3035857-2-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221223095915.3035857-1-a.lauterer@proxmox.com> References: <20221223095915.3035857-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.041 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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. [osd.pm, mon.pm, ceph.pm] Subject: [pve-devel] [PATCH manager v2 1/2] api: ceph: update return schemas 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, 23 Dec 2022 09:59:49 -0000 to include a more complete description of the returned data. Sort properties in alphabetical order if the list is longer. Signed-off-by: Aaron Lauterer --- changes: - split patch 3/3 from the previous series. This patch contains the smaller changes - formatting has been reversed - phrasing for osd tree reworded PVE/API2/Ceph.pm | 7 ++++++- PVE/API2/Ceph/MON.pm | 11 +++++++++-- PVE/API2/Ceph/OSD.pm | 10 ++++++++++ PVE/API2/Cluster/Ceph.pm | 8 ++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.pm index 55220324..cc8720b2 100644 --- a/PVE/API2/Ceph.pm +++ b/PVE/API2/Ceph.pm @@ -622,7 +622,12 @@ __PACKAGE__->register_method ({ type => 'array', items => { type => "object", - properties => {}, + properties => { + name => { + description => "Name of the CRUSH rule.", + type => "string", + } + }, }, links => [ { rel => 'child', href => "{name}" } ], }, diff --git a/PVE/API2/Ceph/MON.pm b/PVE/API2/Ceph/MON.pm index 5771bb46..7f252875 100644 --- a/PVE/API2/Ceph/MON.pm +++ b/PVE/API2/Ceph/MON.pm @@ -212,9 +212,16 @@ __PACKAGE__->register_method ({ items => { type => "object", properties => { - name => { type => 'string' }, addr => { type => 'string', optional => 1 }, - host => { type => 'string', optional => 1 }, + ceph_version => { type => 'string', optional => 1 }, + ceph_version_short => { type => 'string', optional => 1 }, + direxists => { type => 'string', optional => 1 }, + host => { type => 'boolean', optional => 1 }, + name => { type => 'string' }, + quorum => { type => 'boolean', optional => 1 }, + rank => { type => 'integer', optional => 1 }, + service => { type => 'integer', optional => 1 }, + state => { type => 'string', optional => 1 }, }, }, links => [ { rel => 'child', href => "{name}" } ], diff --git a/PVE/API2/Ceph/OSD.pm b/PVE/API2/Ceph/OSD.pm index 93433b3a..18195743 100644 --- a/PVE/API2/Ceph/OSD.pm +++ b/PVE/API2/Ceph/OSD.pm @@ -88,6 +88,16 @@ __PACKAGE__->register_method ({ # fixme: return a list instead of extjs tree format ? returns => { type => "object", + items => { + type => "object", + properties => { + flags => { type => "string" }, + root => { + type => "object", + description => "Tree with OSDs in the CRUSH map structure.", + }, + }, + }, }, code => sub { my ($param) = @_; diff --git a/PVE/API2/Cluster/Ceph.pm b/PVE/API2/Cluster/Ceph.pm index 7f825003..387b8c3c 100644 --- a/PVE/API2/Cluster/Ceph.pm +++ b/PVE/API2/Cluster/Ceph.pm @@ -181,6 +181,14 @@ __PACKAGE__->register_method ({ description => "Flag name.", type => 'string', enum => $possible_flags_list, }, + description => { + description => "Flag description.", + type => 'string', + }, + value => { + description => "Flag value.", + type => 'boolean', + }, }, }, links => [ { rel => 'child', href => "{name}" } ], -- 2.30.2