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 C596387BA for ; Wed, 16 Nov 2022 09:02:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 611A81B7B1 for ; Wed, 16 Nov 2022 09:02:24 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 16 Nov 2022 09:02:23 +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 313EE43C36 for ; Wed, 16 Nov 2022 09:02:23 +0100 (CET) Message-ID: <1e7ba8ac-fc13-763a-174c-6ee0478c29d4@proxmox.com> Date: Wed, 16 Nov 2022 09:02:22 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:107.0) Gecko/20100101 Thunderbird/107.0 Content-Language: en-GB To: Proxmox VE development discussion , Dominik Csapak References: <20221115130248.1007325-1-d.csapak@proxmox.com> <20221115130248.1007325-12-d.csapak@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20221115130248.1007325-12-d.csapak@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: =?UTF-8?Q?0=0A=09?=AWL -0.081 Adjusted score from AWL reputation of From: =?UTF-8?Q?address=0A=09?=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 =?UTF-8?Q?Alignment=0A=09?=NICE_REPLY_A -0.001 Looks like a legit reply (A) POISEN_SPAM_PILL_3 0.1 random spam to be learned in =?UTF-8?Q?bayes=0A=09?=SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF =?UTF-8?Q?Record=0A=09?=SPF_PASS -0.001 SPF: sender matches SPF =?UTF-8?Q?record=0A=09?=URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cluster.pm] Subject: Re: [pve-devel] [PATCH manager v10 01/13] api: /cluster/resources: add tags to returned properties 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, 16 Nov 2022 08:02:24 -0000 would adapt this a bit, see inline, but no hard feelings Am 15/11/2022 um 14:02 schrieb Dominik Csapak: > by querying 'lock' and 'tags' with 'get_guest_config_properties' > > Signed-off-by: Dominik Csapak > --- > PVE/API2/Cluster.pm | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm > index 49e319a5c..34a6e08cd 100644 > --- a/PVE/API2/Cluster.pm > +++ b/PVE/API2/Cluster.pm > @@ -371,7 +371,8 @@ __PACKAGE__->register_method({ > > # we try to generate 'numbers' by using "$X + 0" > if (!$param->{type} || $param->{type} eq 'vm') { > - my $locked_vms = PVE::Cluster::get_guest_config_property('lock'); > + my $prop_list = [qw(lock tags)]; > + my $props = PVE::Cluster::get_guest_config_properties($prop_list); props is a bit generic and having the prop_list here and below adds not much value IMO, maybe rather here: my $extra_guest_info = PVE::Cluster::get_guest_config_properties(['lock', 'tags']); > > for my $vmid (sort keys %$idlist) { > > @@ -403,8 +404,10 @@ __PACKAGE__->register_method({ > # only skip now to next to ensure that the pool stats above are filled, if eligible > next if !$rpcenv->check($authuser, "/vms/$vmid", [ 'VM.Audit' ], 1); > > - if (defined(my $lock = $locked_vms->{$vmid}->{lock})) { > - $entry->{lock} = $lock; > + for my $prop (@$prop_list) { and then here: for my $key (keys $extra_guest_info->{$vmid}->%) { my $value = $extra_guest_info->{$vmid}->{$key} // next; $entry->{$prop} = $extra_guest_info->{$vmid}->{$key}; } > + if (defined(my $value = $props->{$vmid}->{$prop})) { > + $entry->{$prop} = $value; > + } > } > > if (defined($entry->{pool}) &&