From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pdm-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 623691FF15C
for <inbox@lore.proxmox.com>; Fri, 18 Apr 2025 08:15:23 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id B309A36A7D;
Fri, 18 Apr 2025 08:15:19 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Date: Fri, 18 Apr 2025 08:15:16 +0200
Message-Id: <20250418061516.259333-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.39.5
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.022 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
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
Subject: [pdm-devel] [PATCH datacenter-manager v2] server: api: resources:
handle template in status count
X-BeenThere: pdm-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Datacenter Manager development discussion
<pdm-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pdm-devel>,
<mailto:pdm-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pdm-devel/>
List-Post: <mailto:pdm-devel@lists.proxmox.com>
List-Help: <mailto:pdm-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel>,
<mailto:pdm-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Datacenter Manager development discussion
<pdm-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pdm-devel-bounces@lists.proxmox.com
Sender: "pdm-devel" <pdm-devel-bounces@lists.proxmox.com>
Originally, the PVE API schema description did not include the template
flag (so the information was not present in the rust types), and after
adding it, we forgot to update this part of the code to count the
templates correctly.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
changes from v1:
* add commit message to explain why we do this now
server/src/api/resources.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/src/api/resources.rs b/server/src/api/resources.rs
index 453d9e8..ddcee7e 100644
--- a/server/src/api/resources.rs
+++ b/server/src/api/resources.rs
@@ -191,14 +191,14 @@ pub async fn get_status(
_ => counts.storages.unknown += 1,
},
Resource::PveQemu(r) => match r.status.as_str() {
+ _ if r.template => counts.qemu.template += 1,
"running" => counts.qemu.running += 1,
- // FIXME: handle templates
"stopped" => counts.qemu.stopped += 1,
_ => counts.qemu.unknown += 1,
},
Resource::PveLxc(r) => match r.status.as_str() {
+ _ if r.template => counts.lxc.template += 1,
"running" => counts.lxc.running += 1,
- // FIXME: handle templates
"stopped" => counts.lxc.stopped += 1,
_ => counts.lxc.unknown += 1,
},
--
2.39.5
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel