[pdm-devel] [PATCH datacenter-manager 2/5] lib/server: include subscription statistics in subscription information

[Dominik Csapak <d.csapak@proxmox.com>]

so we can show that information on the subscription panel. This is
useful for users to see why the subscription is marked as invalid.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 lib/pdm-api-types/src/subscription.rs | 20 +++++++++++++++++++-
 server/src/api/nodes/subscription.rs  | 24 +++++++++++++-----------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/lib/pdm-api-types/src/subscription.rs b/lib/pdm-api-types/src/subscription.rs
index d38611e3..ca23b8e5 100644
--- a/lib/pdm-api-types/src/subscription.rs
+++ b/lib/pdm-api-types/src/subscription.rs
@@ -4,7 +4,7 @@ use anyhow::Error;
 use serde::{Deserialize, Serialize};
 
 use proxmox_schema::api;
-use proxmox_subscription::SubscriptionStatus;
+use proxmox_subscription::{SubscriptionInfo, SubscriptionStatus};
 
 #[api]
 // order is important here, since we use that for determining if a node has a valid subscription
@@ -156,3 +156,21 @@ pub struct SubscriptionStatistics {
     /// Total number of community level subscriptions across all remotes
     pub community: usize,
 }
+
+#[api(
+    properties: {
+        info: {
+            type: SubscriptionInfo,
+        }
+    }
+)]
+#[derive(Default, Serialize, Deserialize, Clone, PartialEq)]
+#[serde(rename_all = "kebab-case")]
+/// The PDM subscription info
+pub struct PdmSubscriptionInfo {
+    #[serde(flatten)]
+    pub info: SubscriptionInfo,
+
+    /// PDM subscription statistics
+    pub statistics: SubscriptionStatistics,
+}
diff --git a/server/src/api/nodes/subscription.rs b/server/src/api/nodes/subscription.rs
index d9b44d59..d41a1794 100644
--- a/server/src/api/nodes/subscription.rs
+++ b/server/src/api/nodes/subscription.rs
@@ -11,7 +11,7 @@ use proxmox_sys::fs::CreateOptions;
 
 use pdm_api_types::remotes::RemoteType;
 use pdm_api_types::subscription::{
-    NodeSubscriptionInfo, SubscriptionLevel, SubscriptionStatistics,
+    NodeSubscriptionInfo, PdmSubscriptionInfo, SubscriptionLevel, SubscriptionStatistics,
 };
 use pdm_api_types::PRIV_SYS_MODIFY;
 
@@ -78,7 +78,7 @@ fn count_subscriptions(
     stats
 }
 
-fn check_counts(stats: SubscriptionStatistics) -> Result<(), Error> {
+fn check_counts(stats: &SubscriptionStatistics) -> Result<(), Error> {
     let subscribed_ratio = stats.active_subscriptions as f64 / stats.total_nodes as f64;
     let community_ratio = stats.community as f64 / stats.active_subscriptions as f64;
 
@@ -107,26 +107,28 @@ fn check_counts(stats: SubscriptionStatistics) -> Result<(), Error> {
     }
 )]
 /// Return subscription status
-pub async fn get_subscription() -> Result<SubscriptionInfo, Error> {
+pub async fn get_subscription() -> Result<PdmSubscriptionInfo, Error> {
     let infos = get_all_subscription_infos().await?;
 
-    let stats = count_subscriptions(&infos);
+    let statistics = count_subscriptions(&infos);
 
-    if let Err(err) = check_counts(stats) {
-        Ok(SubscriptionInfo {
+    let info = if let Err(err) = check_counts(&statistics) {
+        SubscriptionInfo {
             status: SubscriptionStatus::Invalid,
             message: Some(format!("{err}")),
             serverid: None,
             url: Some(PRODUCT_URL.into()),
             ..Default::default()
-        })
+        }
     } else {
-        Ok(SubscriptionInfo {
+        SubscriptionInfo {
             status: SubscriptionStatus::Active,
             url: Some(PRODUCT_URL.into()),
             ..Default::default()
-        })
-    }
+        }
+    };
+
+    Ok(PdmSubscriptionInfo { info, statistics })
 }
 
 #[api(
@@ -147,7 +149,7 @@ pub async fn check_subscription() -> Result<(), Error> {
     let infos = get_all_subscription_infos().await?;
     let stats = count_subscriptions(&infos);
 
-    if let Err(err) = check_counts(stats) {
+    if let Err(err) = check_counts(&stats) {
         update_apt_auth(APT_AUTH_FN, apt_auth_file_opts(), APT_AUTH_URL, None, None)?;
         return Err(err);
     }
-- 
2.47.3



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel