From: Dominik Csapak <d.csapak@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH datacenter-manager v2 5/9] server: api: pve/pbs: node: add subscription api call
Date: Mon, 1 Dec 2025 14:53:05 +0100 [thread overview]
Message-ID: <20251201135318.2983539-8-d.csapak@proxmox.com> (raw)
In-Reply-To: <20251201135318.2983539-1-d.csapak@proxmox.com>
returns the subscription information per node
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
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<proxmox_subscription::SubscriptionInfo, Error> {
+ 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<pve_api_types::NodeS
let result = client.node_status(&node).await?;
Ok(result)
}
+
+#[api(
+ input: {
+ properties: {
+ remote: { schema: REMOTE_ID_SCHEMA },
+ node: { schema: NODE_SCHEMA },
+ },
+ },
+ access: {
+ permission: &Permission::Privilege(&["resource", "{remote}", "node", "{node}"], PRIV_RESOURCE_AUDIT, false),
+ },
+ returns: { type: pve_api_types::NodeStatus },
+)]
+/// Get subscription for the node
+async fn get_subscription(
+ remote: String,
+ node: String,
+) -> Result<pve_api_types::NodeSubscriptionInfo, Error> {
+ 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
next prev parent reply other threads:[~2025-12-01 13:53 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-01 13:52 [pdm-devel] [PATCH datacenter-manager/yew-comp v2 00/11] add subscription checks to apt repository updates & login Dominik Csapak
2025-12-01 13:52 ` [pdm-devel] [PATCH yew-comp v2 1/2] subscription: refactor api subscription check for showing the alert Dominik Csapak
2025-12-01 19:02 ` [pdm-devel] applied: " Thomas Lamprecht
2025-12-01 13:53 ` [pdm-devel] [PATCH yew-comp v2 2/2] apt package manager: add optional subscription check on 'Refresh' button Dominik Csapak
2025-12-01 13:53 ` [pdm-devel] [PATCH datacenter-manager v2 1/9] subscription: add serverid field to node subscription info Dominik Csapak
2025-12-01 23:01 ` [pdm-devel] applied: " Thomas Lamprecht
2025-12-01 13:53 ` [pdm-devel] [PATCH datacenter-manager v2 2/9] api types: add new SubscriptionStatistics Dominik Csapak
2025-12-01 23:01 ` [pdm-devel] applied: " Thomas Lamprecht
2025-12-01 13:53 ` [pdm-devel] [PATCH datacenter-manager v2 3/9] api: add subscription endpoints Dominik Csapak
2025-12-01 23:01 ` [pdm-devel] applied: " Thomas Lamprecht
2025-12-01 13:53 ` [pdm-devel] [PATCH datacenter-manager v2 4/9] server: api: subscription: fix permission check Dominik Csapak
2025-12-01 23:01 ` [pdm-devel] applied: " Thomas Lamprecht
2025-12-01 13:53 ` Dominik Csapak [this message]
2025-12-01 23:01 ` [pdm-devel] applied: [PATCH datacenter-manager v2 5/9] server: api: pve/pbs: node: add subscription api call Thomas Lamprecht
2025-12-01 13:53 ` [pdm-devel] [PATCH datacenter-manager v2 6/9] ui: pve/pbs: updates: add subscription_url Dominik Csapak
2025-12-01 23:01 ` [pdm-devel] applied: " Thomas Lamprecht
2025-12-01 13:53 ` [pdm-devel] [PATCH datacenter-manager v2 7/9] ui: login: enable subscription check Dominik Csapak
2025-12-01 23:02 ` [pdm-devel] applied: " Thomas Lamprecht
2025-12-01 13:53 ` [pdm-devel] [PATCH datacenter-manager v2 8/9] ui: refactor check_subscription into lib Dominik Csapak
2025-12-01 23:02 ` [pdm-devel] applied: " Thomas Lamprecht
2025-12-01 13:53 ` [pdm-devel] [PATCH datacenter-manager v2 9/9] ui: remote updates: add subscription check on 'Refresh all' Dominik Csapak
2025-12-01 23:02 ` [pdm-devel] applied: " 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=20251201135318.2983539-8-d.csapak@proxmox.com \
--to=d.csapak@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.