From: Christian Ebner <c.ebner@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH datacenter-manager v3 18/19] server: resources: add property matching for resources
Date: Tue, 21 Oct 2025 13:11:28 +0200 [thread overview]
Message-ID: <20251021111129.294349-19-c.ebner@proxmox.com> (raw)
In-Reply-To: <20251021111129.294349-1-c.ebner@proxmox.com>
Extends the search categories by the Property variant, which allows
to match against a list of properties defined on a resource.
Resources provide the list of properties as comma separates strings.
Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
Changes since version 2:
- not present in previous version
server/src/api/resources.rs | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/server/src/api/resources.rs b/server/src/api/resources.rs
index 3b629d1..57563b3 100644
--- a/server/src/api/resources.rs
+++ b/server/src/api/resources.rs
@@ -59,6 +59,7 @@ enum MatchCategory {
Template,
Remote,
RemoteType,
+ Property,
}
impl std::str::FromStr for MatchCategory {
@@ -73,6 +74,7 @@ impl std::str::FromStr for MatchCategory {
"template" => MatchCategory::Template,
"remote" => MatchCategory::Remote,
"remote-type" => MatchCategory::RemoteType,
+ "property" => MatchCategory::Property,
_ => bail!("invalid category"),
};
Ok(category)
@@ -99,6 +101,10 @@ impl MatchCategory {
(Ok(a), Ok(b)) => a == b,
_ => false,
},
+ MatchCategory::Property => value
+ .to_lowercase()
+ .split(",")
+ .any(|property| property == search_term.to_lowercase()),
}
}
}
@@ -115,6 +121,7 @@ fn resource_matches_search_term(
MatchCategory::Name => category.matches(resource.name(), &term.value),
MatchCategory::Id => category.matches(&resource.id(), &term.value),
MatchCategory::Status => category.matches(resource.status(), &term.value),
+ MatchCategory::Property => category.matches(&resource.properties(), &term.value),
MatchCategory::Template => match resource {
Resource::PveQemu(PveQemuResource { template, .. })
| Resource::PveLxc(PveLxcResource { template, .. }) => {
@@ -151,6 +158,7 @@ fn remote_matches_search_term(
Some(false) => category.matches("offline", &term.value),
None => true,
},
+ MatchCategory::Property => false,
MatchCategory::Template => false,
MatchCategory::RemoteType => category.matches(&remote.ty.to_string(), &term.value),
},
--
2.47.3
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
next prev parent reply other threads:[~2025-10-21 11:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-21 11:11 [pdm-devel] [PATCH datacenter-manager v3 00/19] add remote type based search and PBS node status panel to dashboard Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 01/19] server: fix small formatting issue via `cargo fmt` Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 02/19] server: api: pass remote as reference to fetching helpers Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 03/19] server: api: refactor filter logic for resource post gathering Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 04/19] api: resources: new transient type for remote resource gathering Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 05/19] server: api: add remote-type search category for resources Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 06/19] pdm-api-types: extend resource status by list of failed remotes Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 07/19] server: api: collect failed remotes list while getting status Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 08/19] ui: dashboard: reimplement node status panel as dedicated component Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 09/19] ui: dashboard: use new node status component Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 10/19] ui: dashboard: extend node panel creation by remote type Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 11/19] ui: dashboard: expose PBS nodes status panel Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 12/19] pdm-api-types: introduce PBS datastore specific counters Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 13/19] pdm-api-types/resources: extend datastore resources by config properties Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 14/19] server: resources: extend the PBS " Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 15/19] server: resources: extend datastore status counters by multiple states Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 16/19] pdm-api-types: extend status matching for PBS datastore resources Christian Ebner
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 17/19] pdm-api-types: extend resources by properties string generator method Christian Ebner
2025-10-21 11:11 ` Christian Ebner [this message]
2025-10-21 11:11 ` [pdm-devel] [PATCH datacenter-manager v3 19/19] ui: dashboard: add panel for PBS datastore statistics Christian Ebner
2025-10-23 21:23 ` [pdm-devel] [PATCH datacenter-manager v3 00/19] add remote type based search and PBS node status panel to dashboard Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251021111129.294349-19-c.ebner@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=pdm-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox