From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 59C301FF178 for ; Mon, 1 Dec 2025 14:53:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 280211E098; Mon, 1 Dec 2025 14:53:56 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Mon, 1 Dec 2025 14:53:05 +0100 Message-ID: <20251201135318.2983539-8-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251201135318.2983539-1-d.csapak@proxmox.com> References: <20251201135318.2983539-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 5/9] server: api: pve/pbs: node: add subscription api call X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" returns the subscription information per node Signed-off-by: Dominik Csapak --- server/src/api/pbs/node.rs | 39 +++++++++++++++++++++++++++++++++++++- server/src/api/pve/node.rs | 27 ++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/server/src/api/pbs/node.rs b/server/src/api/pbs/node.rs index cf8cbea5..aafefc2a 100644 --- a/server/src/api/pbs/node.rs +++ b/server/src/api/pbs/node.rs @@ -1,6 +1,17 @@ -use proxmox_router::{list_subdirs_api_method, Router, SubdirMap}; +use anyhow::Error; + +use proxmox_router::{list_subdirs_api_method, Permission, Router, SubdirMap}; +use proxmox_schema::api; use proxmox_sortable_macro::sortable; +use pdm_api_types::remotes::REMOTE_ID_SCHEMA; +use pdm_api_types::PRIV_RESOURCE_AUDIT; + +use pbs_api_types::NODE_SCHEMA; + +use crate::connection; +use crate::pbs_client::get_remote; + pub const ROUTER: Router = Router::new() .get(&list_subdirs_api_method!(SUBDIRS)) .subdirs(SUBDIRS); @@ -8,6 +19,10 @@ pub const ROUTER: Router = Router::new() #[sortable] const SUBDIRS: SubdirMap = &sorted!([ ("apt", &crate::api::remote_updates::APT_ROUTER), + ( + "subscription", + &Router::new().get(&API_METHOD_GET_SUBSCRIPTION) + ), ( "termproxy", &Router::new().post(&crate::api::remote_shell::API_METHOD_SHELL_TICKET) @@ -17,3 +32,25 @@ const SUBDIRS: SubdirMap = &sorted!([ &Router::new().upgrade(&crate::api::remote_shell::API_METHOD_SHELL_WEBSOCKET) ), ]); + +#[api( + input: { + properties: { + remote: { schema: REMOTE_ID_SCHEMA }, + node: { schema: NODE_SCHEMA }, // not used, always localhost + }, + }, + access: { + permission: &Permission::Privilege(&["resource", "{remote}"], PRIV_RESOURCE_AUDIT, false), + description: "The user needs to have at least the `Resource.Audit` privilege on `/resource/{remote}`." + }, + returns: { type: proxmox_subscription::SubscriptionInfo } +)] +/// Get subscription for the PBS remote +async fn get_subscription(remote: String) -> Result { + let (remotes, _) = pdm_config::remotes::config()?; + let remote = get_remote(&remotes, &remote)?; + Ok(connection::make_pbs_client(remote)? + .get_subscription() + .await?) +} diff --git a/server/src/api/pve/node.rs b/server/src/api/pve/node.rs index d8690f63..376234c7 100644 --- a/server/src/api/pve/node.rs +++ b/server/src/api/pve/node.rs @@ -29,6 +29,10 @@ const SUBDIRS: SubdirMap = &sorted!([ ), ("storage", &STORAGE_ROUTER), ("status", &Router::new().get(&API_METHOD_GET_STATUS)), + ( + "subscription", + &Router::new().get(&API_METHOD_GET_SUBSCRIPTION) + ), ]); const STORAGE_ROUTER: Router = Router::new() @@ -153,3 +157,26 @@ async fn get_status(remote: String, node: String) -> Result Result { + let (remotes, _) = pdm_config::remotes::config()?; + let client = super::connect_to_remote(&remotes, &remote)?; + let result = client.get_subscription(&node).await?; + Ok(result) +} -- 2.47.3 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel