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 0283C696CF for ; Thu, 11 Mar 2021 11:26:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 00C4C2697C for ; Thu, 11 Mar 2021 11:26:56 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DA3BB26967 for ; Thu, 11 Mar 2021 11:26:54 +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 A133041BDF for ; Thu, 11 Mar 2021 11:26:54 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 11 Mar 2021 11:26:50 +0100 Message-Id: <20210311102650.6730-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210311102650.6730-1-f.ebner@proxmox.com> References: <20210311102650.6730-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 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 Subject: [pve-devel] [RFC/PATCH v2 container 5/5] vmstatus: make lock property optional again 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: Thu, 11 Mar 2021 10:26:56 -0000 Commit d02262048cbbe91ca8b12f98e3dc7bbab28e4c64 made the property de-facto non-optional. Partially revert this and instead adapt the printing, making the behavior match the API description again. The conditional assignment is already there further down the vmstatus function. Signed-off-by: Fabian Ebner --- New in v2. Alternatively, the property description should be updated, but this patch makes it in line with what we do for VMs and is preferable IMHO. src/PVE/CLI/pct.pm | 3 ++- src/PVE/LXC.pm | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/CLI/pct.pm b/src/PVE/CLI/pct.pm index 856d5a5..69faf8d 100755 --- a/src/PVE/CLI/pct.pm +++ b/src/PVE/CLI/pct.pm @@ -810,7 +810,8 @@ our $cmddef = { my $format = "%-10s %-10s %-12s %-20s\n"; printf($format, 'VMID', 'Status', 'Lock', 'Name'); foreach my $d (sort {$a->{vmid} <=> $b->{vmid} } @$res) { - printf($format, $d->{vmid}, $d->{status}, $d->{lock}, $d->{name}); + my $lock = $d->{lock} || ''; + printf($format, $d->{vmid}, $d->{status}, $lock, $d->{name}); } }], config => [ "PVE::API2::LXC::Config", 'vm_config', ['vmid'], diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 082cab8..7a52196 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -203,7 +203,6 @@ sub vmstatus { $d->{cpus} = $conf->{cores} || $conf->{cpulimit}; $d->{cpus} = $cpucount if !$d->{cpus}; - $d->{lock} = $conf->{lock} || ''; $d->{tags} = $conf->{tags} if defined($conf->{tags}); if ($d->{pid}) { -- 2.20.1