From: Dominik Csapak <d.csapak@proxmox.com>
To: Proxmox Datacenter Manager development discussion
<pdm-devel@lists.proxmox.com>,
Lukas Wagner <l.wagner@proxmox.com>
Subject: Re: [pdm-devel] [PATCH datacenter-manager v2 05/12] views: add tests for view filter implementation
Date: Wed, 5 Nov 2025 11:08:03 +0100 [thread overview]
Message-ID: <b882d347-0367-498f-9fa1-22845084abe2@proxmox.com> (raw)
In-Reply-To: <20251103123521.266258-6-l.wagner@proxmox.com>
IMHO this should be melded into the last commit
On 11/3/25 1:35 PM, Lukas Wagner wrote:
> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
> ---
> server/src/views/mod.rs | 3 +
> server/src/views/tests.rs | 585 ++++++++++++++++++++++++++++++++++++++
> 2 files changed, 588 insertions(+)
> create mode 100644 server/src/views/tests.rs
>
> diff --git a/server/src/views/mod.rs b/server/src/views/mod.rs
> index 9a2856a4..ea9e6de7 100644
> --- a/server/src/views/mod.rs
> +++ b/server/src/views/mod.rs
> @@ -1 +1,4 @@
> pub mod view_filter;
> +
> +#[cfg(test)]
> +mod tests;
> diff --git a/server/src/views/tests.rs b/server/src/views/tests.rs
> new file mode 100644
> index 00000000..013b301f
> --- /dev/null
> +++ b/server/src/views/tests.rs
> @@ -0,0 +1,585 @@
> +use pdm_api_types::{
> + resource::{PveLxcResource, PveQemuResource, PveStorageResource, Resource, ResourceType},
> + views::{FilterRule, ViewFilterConfig},
> +};
> +
> +use super::view_filter::ViewFilter;
> +
> +fn make_storage_resource(remote: &str, node: &str, storage_name: &str) -> Resource {
> + Resource::PveStorage(PveStorageResource {
> + disk: 1000,
> + maxdisk: 2000,
> + id: format!("remote/{remote}/storage/{node}/{storage_name}"),
> + storage: storage_name.into(),
> + node: node.into(),
> + status: "available".into(),
> + })
> +}
> +
> +fn make_qemu_resource(
> + remote: &str,
> + node: &str,
> + vmid: u32,
> + pool: Option<&str>,
> + tags: &[&str],
> +) -> Resource {
> + Resource::PveQemu(PveQemuResource {
> + disk: 1000,
> + maxdisk: 2000,
> + id: format!("remote/{remote}/guest/{vmid}"),
> + node: node.into(),
> + status: "available".into(),
> + cpu: 0.0,
> + maxcpu: 0.0,
> + maxmem: 1024,
> + mem: 512,
> + name: format!("vm-{vmid}"),
> + // TODO: Check the API type - i guess it should be an option?
> + pool: pool.map_or_else(String::new, |a| a.into()),
> + tags: tags.iter().map(|tag| String::from(*tag)).collect(),
> + template: false,
> + uptime: 1337,
> + vmid,
> + })
> +}
> +
> +fn make_lxc_resource(
> + remote: &str,
> + node: &str,
> + vmid: u32,
> + pool: Option<&str>,
> + tags: &[&str],
> +) -> Resource {
> + Resource::PveLxc(PveLxcResource {
> + disk: 1000,
> + maxdisk: 2000,
> + id: format!("remote/{remote}/guest/{vmid}"),
> + node: node.into(),
> + status: "available".into(),
> + cpu: 0.0,
> + maxcpu: 0.0,
> + maxmem: 1024,
> + mem: 512,
> + name: format!("vm-{vmid}"),
> + // TODO: Check the API type - i guess it should be an option?
> + pool: pool.map_or_else(String::new, |a| a.into()),
> + tags: tags.iter().map(|tag| String::from(*tag)).collect(),
> + template: false,
> + uptime: 1337,
> + vmid,
> + })
> +}
> +
> +fn run_test(config: ViewFilterConfig, tests: &[((&str, &Resource), bool)]) {
> + let filter = ViewFilter::new(config);
> +
> + for ((remote_name, resource), expected) in tests {
> + eprintln!("remote: {remote_name}, resource: {resource:?}");
> + assert_eq!(filter.resource_matches(remote_name, resource), *expected);
> + }
> +}
> +
> +const NODE: &str = "somenode";
> +const STORAGE: &str = "somestorage";
> +const REMOTE: &str = "someremote";
> +
> +#[test]
> +fn include_remotes() {
> + let config = ViewFilterConfig {
> + id: "only-includes".into(),
> + include: vec![
> + FilterRule::Remote("remote-a".into()),
> + FilterRule::Remote("remote-b".into()),
> + ],
> + ..Default::default()
> + };
> + run_test(
> + config.clone(),
> + &[
> + (
> + (
> + "remote-a",
> + &make_storage_resource("remote-a", NODE, STORAGE),
> + ),
> + true,
> + ),
> + (
> + (
> + "remote-b",
> + &make_storage_resource("remote-b", NODE, STORAGE),
> + ),
> + true,
> + ),
> + (
> + (
> + "remote-c",
> + &make_storage_resource("remote-c", NODE, STORAGE),
> + ),
> + false,
> + ),
> + ],
> + );
> +
> + let filter = ViewFilter::new(config);
> +
> + assert!(!filter.can_skip_remote("remote-a"));
> + assert!(!filter.can_skip_remote("remote-b"));
> + assert!(filter.can_skip_remote("remote-c"));
> +}
> +
> +#[test]
> +fn exclude_remotes() {
> + let config = ViewFilterConfig {
> + id: "only-excludes".into(),
> + exclude: vec![
> + FilterRule::Remote("remote-a".into()),
> + FilterRule::Remote("remote-b".into()),
> + ],
> + ..Default::default()
> + };
> +
> + run_test(
> + config.clone(),
> + &[
> + (
> + (
> + "remote-a",
> + &make_storage_resource("remote-a", NODE, STORAGE),
> + ),
> + false,
> + ),
> + (
> + (
> + "remote-b",
> + &make_storage_resource("remote-b", NODE, STORAGE),
> + ),
> + false,
> + ),
> + (
> + (
> + "remote-c",
> + &make_storage_resource("remote-c", NODE, STORAGE),
> + ),
> + true,
> + ),
> + ],
> + );
> +
> + let filter = ViewFilter::new(config);
> +
> + assert!(filter.can_skip_remote("remote-a"));
> + assert!(filter.can_skip_remote("remote-b"));
> + assert!(!filter.can_skip_remote("remote-c"));
> +}
> +
> +#[test]
> +fn include_exclude_remotes() {
> + let config = ViewFilterConfig {
> + id: "both".into(),
> + include: vec![
> + FilterRule::Remote("remote-a".into()),
> + FilterRule::Remote("remote-b".into()),
> + ],
> + exclude: vec![
> + FilterRule::Remote("remote-b".into()),
> + FilterRule::Remote("remote-c".into()),
> + ],
> + };
> + run_test(
> + config.clone(),
> + &[
> + (
> + (
> + "remote-a",
> + &make_storage_resource("remote-a", NODE, STORAGE),
> + ),
> + true,
> + ),
> + (
> + (
> + "remote-b",
> + &make_storage_resource("remote-b", NODE, STORAGE),
> + ),
> + false,
> + ),
> + (
> + (
> + "remote-c",
> + &make_storage_resource("remote-c", NODE, STORAGE),
> + ),
> + false,
> + ),
> + ],
> + );
> +
> + let filter = ViewFilter::new(config);
> +
> + assert!(!filter.can_skip_remote("remote-a"));
> + assert!(filter.can_skip_remote("remote-b"));
> + assert!(filter.can_skip_remote("remote-c"));
> + assert!(filter.can_skip_remote("remote-d"));
> +}
> +
> +#[test]
> +fn empty_config() {
> + let config = ViewFilterConfig {
> + id: "empty".into(),
> + ..Default::default()
> + };
> + run_test(
> + config.clone(),
> + &[
> + (
> + (
> + "remote-a",
> + &make_storage_resource("remote-a", NODE, STORAGE),
> + ),
> + true,
> + ),
> + (
> + (
> + "remote-b",
> + &make_storage_resource("remote-b", NODE, STORAGE),
> + ),
> + true,
> + ),
> + (
> + (
> + "remote-c",
> + &make_storage_resource("remote-c", NODE, STORAGE),
> + ),
> + true,
> + ),
> + (
> + (REMOTE, &make_qemu_resource(REMOTE, NODE, 100, None, &[])),
> + true,
> + ),
> + ],
> + );
> +
> + let filter = ViewFilter::new(config);
> +
> + assert!(!filter.can_skip_remote("remote-a"));
> + assert!(!filter.can_skip_remote("remote-b"));
> + assert!(!filter.can_skip_remote("remote-c"));
> +}
> +
> +#[test]
> +fn include_type() {
> + run_test(
> + ViewFilterConfig {
> + id: "include-resource-type".into(),
> + include: vec![
> + FilterRule::ResourceType(ResourceType::PveStorage),
> + FilterRule::ResourceType(ResourceType::PveQemu),
> + ],
> + ..Default::default()
> + },
> + &[
> + (
> + (REMOTE, &make_storage_resource(REMOTE, NODE, STORAGE)),
> + true,
> + ),
> + (
> + (REMOTE, &make_qemu_resource(REMOTE, NODE, 100, None, &[])),
> + true,
> + ),
> + (
> + (REMOTE, &make_lxc_resource(REMOTE, NODE, 101, None, &[])),
> + false,
> + ),
> + ],
> + );
> +}
> +
> +#[test]
> +fn exclude_type() {
> + run_test(
> + ViewFilterConfig {
> + id: "exclude-resource-type".into(),
> + exclude: vec![
> + FilterRule::ResourceType(ResourceType::PveStorage),
> + FilterRule::ResourceType(ResourceType::PveQemu),
> + ],
> + ..Default::default()
> + },
> + &[
> + (
> + (REMOTE, &make_storage_resource(REMOTE, NODE, STORAGE)),
> + false,
> + ),
> + (
> + (REMOTE, &make_qemu_resource(REMOTE, NODE, 100, None, &[])),
> + false,
> + ),
> + (
> + (REMOTE, &make_lxc_resource(REMOTE, NODE, 101, None, &[])),
> + true,
> + ),
> + ],
> + );
> +}
> +
> +#[test]
> +fn include_exclude_type() {
> + run_test(
> + ViewFilterConfig {
> + id: "exclude-resource-type".into(),
> + include: vec![FilterRule::ResourceType(ResourceType::PveQemu)],
> + exclude: vec![FilterRule::ResourceType(ResourceType::PveStorage)],
> + },
> + &[
> + (
> + (REMOTE, &make_storage_resource(REMOTE, NODE, STORAGE)),
> + false,
> + ),
> + (
> + (REMOTE, &make_qemu_resource(REMOTE, NODE, 100, None, &[])),
> + true,
> + ),
> + (
> + (REMOTE, &make_lxc_resource(REMOTE, NODE, 101, None, &[])),
> + false,
> + ),
> + ],
> + );
> +}
> +
> +#[test]
> +fn include_exclude_tags() {
> + run_test(
> + ViewFilterConfig {
> + id: "include-tags".into(),
> + include: vec![
> + FilterRule::Tag("tag1".to_string()),
> + FilterRule::Tag("tag2".to_string()),
> + ],
> + exclude: vec![FilterRule::Tag("tag3".to_string())],
> + },
> + &[
> + (
> + (REMOTE, &make_storage_resource(REMOTE, NODE, STORAGE)),
> + // only qemu/lxc can match tags for now
> + false,
> + ),
> + (
> + (
> + REMOTE,
> + &make_qemu_resource(REMOTE, NODE, 100, None, &["tag1", "tag3"]),
> + ),
> + // because tag3 is excluded
> + false,
> + ),
> + (
> + (
> + REMOTE,
> + &make_lxc_resource(REMOTE, NODE, 101, None, &["tag1"]),
> + ),
> + // matches since it's in the includes
> + true,
> + ),
> + (
> + (
> + REMOTE,
> + &make_lxc_resource(REMOTE, NODE, 102, None, &["tag4"]),
> + ),
> + // Not in includes, can never match
> + false,
> + ),
> + ],
> + );
> +}
> +
> +#[test]
> +fn include_exclude_resource_pool() {
> + run_test(
> + ViewFilterConfig {
> + id: "pools".into(),
> + include: vec![
> + FilterRule::ResourcePool("pool1".to_string()),
> + FilterRule::ResourcePool("pool2".to_string()),
> + ],
> + exclude: vec![FilterRule::ResourcePool("pool2".to_string())],
> + },
> + &[
> + (
> + (REMOTE, &make_storage_resource(REMOTE, NODE, STORAGE)),
> + // only qemu/lxc can match pools for now
> + false,
> + ),
> + (
> + (
> + REMOTE,
> + &make_qemu_resource(REMOTE, NODE, 100, Some("pool2"), &[]),
> + ),
> + // because pool2 is excluded (takes precedence over includes)
> + false,
> + ),
> + (
> + (
> + REMOTE,
> + &make_lxc_resource(REMOTE, NODE, 101, Some("pool1"), &[]),
> + ),
> + // matches since it's in the includes
> + true,
> + ),
> + (
> + (
> + REMOTE,
> + &make_lxc_resource(REMOTE, NODE, 102, Some("pool4"), &[]),
> + ),
> + // Not in includes, can never match
> + false,
> + ),
> + ],
> + );
> +}
> +
> +#[test]
> +fn include_exclude_resource_id() {
> + run_test(
> + ViewFilterConfig {
> + id: "resource-id".into(),
> + include: vec![
> + FilterRule::ResourceId(format!("remote/{REMOTE}/guest/100")),
> + FilterRule::ResourceId(format!("remote/{REMOTE}/storage/{NODE}/{STORAGE}")),
> + ],
> + exclude: vec![
> + FilterRule::ResourceId(format!("remote/{REMOTE}/guest/101")),
> + FilterRule::ResourceId("remote/otherremote/guest/101".to_string()),
> + FilterRule::ResourceId(format!("remote/{REMOTE}/storage/{NODE}/otherstorage")),
> + ],
> + },
> + &[
> + (
> + (REMOTE, &make_storage_resource(REMOTE, NODE, STORAGE)),
> + true,
> + ),
> + (
> + (REMOTE, &make_qemu_resource(REMOTE, NODE, 100, None, &[])),
> + true,
> + ),
> + (
> + (REMOTE, &make_lxc_resource(REMOTE, NODE, 101, None, &[])),
> + false,
> + ),
> + (
> + (REMOTE, &make_lxc_resource(REMOTE, NODE, 102, None, &[])),
> + false,
> + ),
> + (
> + (
> + "otherremote",
> + &make_lxc_resource("otherremote", NODE, 101, None, &[]),
> + ),
> + false,
> + ),
> + (
> + (
> + "yetanoterremote",
> + &make_lxc_resource("yetanotherremote", NODE, 104, None, &[]),
> + ),
> + false,
> + ),
> + ],
> + );
> +}
> +
> +#[test]
> +fn node_included() {
> + let filter = ViewFilter::new(ViewFilterConfig {
> + id: "both".into(),
> +
> + include: vec![
> + FilterRule::Remote("remote-a".to_string()),
> + FilterRule::ResourceId("remote/someremote/node/test".to_string()),
> + ],
> + exclude: vec![FilterRule::Remote("remote-b".to_string())],
> + });
> +
> + assert!(filter.is_node_included("remote-a", "somenode"));
> + assert!(filter.is_node_included("remote-a", "somenode2"));
> + assert!(!filter.is_node_included("remote-b", "somenode"));
> + assert!(!filter.is_node_included("remote-b", "somenode2"));
> + assert!(filter.is_node_included("someremote", "test"));
> +
> + assert_eq!(filter.name(), "both");
> +}
> +
> +#[test]
> +fn can_skip_remote_if_excluded() {
> + let filter = ViewFilter::new(ViewFilterConfig {
> + id: "abc".into(),
> + include: vec![],
> + exclude: vec![FilterRule::Remote("remote-b".to_string())],
> + });
> +
> + assert!(!filter.can_skip_remote("remote-a"));
> + assert!(filter.can_skip_remote("remote-b"));
> +}
> +
> +#[test]
> +fn can_skip_remote_if_included() {
> + let filter = ViewFilter::new(ViewFilterConfig {
> + id: "abc".into(),
> + include: vec![FilterRule::Remote("remote-b".to_string())],
> + exclude: vec![],
> + });
> +
> + assert!(!filter.can_skip_remote("remote-b"));
> + assert!(filter.can_skip_remote("remote-a"));
> +}
> +
> +#[test]
> +fn can_skip_remote_cannot_skip_if_any_other_include() {
> + let filter = ViewFilter::new(ViewFilterConfig {
> + id: "abc".into(),
> + include: vec![
> + FilterRule::Remote("remote-b".to_string()),
> + FilterRule::ResourceId("resource/remote-a/guest/100".to_string()),
> + ],
> + exclude: vec![],
> + });
> +
> + assert!(!filter.can_skip_remote("remote-b"));
> + assert!(!filter.can_skip_remote("remote-a"));
> +}
> +
> +#[test]
> +fn can_skip_remote_explicit_remote_exclude() {
> + let filter = ViewFilter::new(ViewFilterConfig {
> + id: "abc".into(),
> + include: vec![FilterRule::ResourceId(
> + "resource/remote-a/guest/100".to_string(),
> + )],
> + exclude: vec![FilterRule::Remote("remote-a".to_string())],
> + });
> +
> + assert!(filter.can_skip_remote("remote-a"));
> +}
> +
> +#[test]
> +fn can_skip_remote_with_empty_config() {
> + let filter = ViewFilter::new(ViewFilterConfig {
> + id: "abc".into(),
> + include: vec![],
> + exclude: vec![],
> + });
> +
> + assert!(!filter.can_skip_remote("remote-a"));
> + assert!(!filter.can_skip_remote("remote-b"));
> +}
> +
> +#[test]
> +fn can_skip_remote_with_no_remote_includes() {
> + let filter = ViewFilter::new(ViewFilterConfig {
> + id: "abc".into(),
> + include: vec![FilterRule::ResourceId(
> + "resource/remote-a/guest/100".to_string(),
> + )],
> + exclude: vec![],
> + });
> +
> + assert!(!filter.can_skip_remote("remote-a"));
> + assert!(!filter.can_skip_remote("remote-b"));
> +}
_______________________________________________
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-11-05 10:07 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-03 12:35 [pdm-devel] [PATCH datacenter-manager v2 00/12] backend implementation for view filters Lukas Wagner
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 01/12] pdm-api-types: views: add ViewFilterConfig type Lukas Wagner
2025-11-05 10:07 ` Dominik Csapak
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 02/12] pdm-config: views: add support for view-filters Lukas Wagner
2025-11-05 10:07 ` Dominik Csapak
2025-11-05 10:37 ` Lukas Wagner
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 03/12] acl: add '/view' and '/view/{view-id}' as allowed ACL paths Lukas Wagner
2025-11-05 10:07 ` Dominik Csapak
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 04/12] views: add implementation for view filters Lukas Wagner
2025-11-05 10:08 ` Dominik Csapak
2025-11-05 10:58 ` Lukas Wagner
2025-11-05 11:48 ` Dominik Csapak
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 05/12] views: add tests for view filter implementation Lukas Wagner
2025-11-05 10:08 ` Dominik Csapak [this message]
2025-11-05 10:58 ` Lukas Wagner
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 06/12] api: resources: list: add support for view-filter parameter Lukas Wagner
2025-11-05 10:08 ` Dominik Csapak
2025-11-05 14:56 ` Lukas Wagner
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 07/12] api: resources: top entities: " Lukas Wagner
2025-11-05 10:08 ` Dominik Csapak
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 08/12] api: resources: status: " Lukas Wagner
2025-11-05 10:08 ` Dominik Csapak
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 09/12] api: subscription " Lukas Wagner
2025-11-05 10:08 ` Dominik Csapak
2025-11-05 14:11 ` Lukas Wagner
2025-11-05 14:28 ` Dominik Csapak
2025-11-05 14:35 ` Lukas Wagner
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 10/12] api: remote-tasks: " Lukas Wagner
2025-11-05 10:09 ` Dominik Csapak
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 11/12] pdm-client: resource list: add " Lukas Wagner
2025-11-05 10:11 ` Dominik Csapak
2025-11-03 12:35 ` [pdm-devel] [PATCH datacenter-manager v2 12/12] pdm-client: top entities: " Lukas Wagner
2025-11-05 10:12 ` Dominik Csapak
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=b882d347-0367-498f-9fa1-22845084abe2@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=l.wagner@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