[pdm-devel] [PATCH datacenter-manager 05/13] remote updates: include repository status in node summary
Lukas Wagner
l.wagner at proxmox.com
Thu Nov 27 11:44:39 CET 2025
Augment the per-node summary with a field that represents the APT
repository configuration. Its value is an enum that can represent the
most common issues, such as
- missing product repo
- unstable repos
- missing subscription if the enterprise repo is enabled
Signed-off-by: Lukas Wagner <l.wagner at proxmox.com>
---
lib/pdm-api-types/src/remote_updates.rs | 22 +++++++
server/src/remote_updates.rs | 77 ++++++++++++++++++++++++-
2 files changed, 97 insertions(+), 2 deletions(-)
diff --git a/lib/pdm-api-types/src/remote_updates.rs b/lib/pdm-api-types/src/remote_updates.rs
index 05ff3379..7b4bc112 100644
--- a/lib/pdm-api-types/src/remote_updates.rs
+++ b/lib/pdm-api-types/src/remote_updates.rs
@@ -114,6 +114,25 @@ pub struct PackageVersion {
pub version: String,
}
+#[api]
+#[derive(Default, Clone, Copy, Debug, Deserialize, Serialize, PartialEq, PartialOrd)]
+#[serde(rename_all = "kebab-case")]
+/// Product repository status.
+pub enum ProductRepositoryStatus {
+ // NOTE: These are sorted in ascending severity.
+ /// Enterprise repository with a valid subscription.
+ Ok,
+ /// Non-production-ready (no-subscription, test) repository is enabled.
+ NonProductionReady,
+ /// Enterprise-repository is enabled, but there is no valid subscription.
+ MissingSubscriptionForEnterprise,
+ /// No product-specific repository is enabled.
+ NoProductRepository,
+ /// Other kind of error.
+ #[default]
+ Error,
+}
+
#[api(
properties: {
versions: {
@@ -140,4 +159,7 @@ pub struct NodeUpdateSummary {
/// Versions of the most important packages.
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub versions: Vec<PackageVersion>,
+ /// Repository status.
+ #[serde(default)]
+ pub repository_status: ProductRepositoryStatus,
}
diff --git a/server/src/remote_updates.rs b/server/src/remote_updates.rs
index ad85ee85..d6fe352c 100644
--- a/server/src/remote_updates.rs
+++ b/server/src/remote_updates.rs
@@ -4,11 +4,11 @@ use std::io::ErrorKind;
use anyhow::Error;
use serde::{Deserialize, Serialize};
-use proxmox_apt_api_types::APTUpdateInfo;
+use proxmox_apt_api_types::{APTRepositoriesResult, APTRepositoryHandle, APTUpdateInfo};
use pdm_api_types::remote_updates::{
NodeUpdateStatus, NodeUpdateSummary, NodeUpdateSummaryWrapper, PackageVersion,
- RemoteUpdateStatus, RemoteUpdateSummary, UpdateSummary,
+ ProductRepositoryStatus, RemoteUpdateStatus, RemoteUpdateSummary, UpdateSummary,
};
use pdm_api_types::remotes::{Remote, RemoteType};
use pdm_api_types::RemoteUpid;
@@ -25,6 +25,7 @@ struct NodeUpdateInfo {
updates: Vec<APTUpdateInfo>,
last_refresh: i64,
versions: Vec<PackageVersion>,
+ repository_status: ProductRepositoryStatus,
}
impl From<NodeUpdateInfo> for NodeUpdateSummary {
@@ -35,6 +36,7 @@ impl From<NodeUpdateInfo> for NodeUpdateSummary {
status: NodeUpdateStatus::Success,
status_message: None,
versions: value.versions,
+ repository_status: value.repository_status,
}
}
}
@@ -227,6 +229,7 @@ pub async fn refresh_update_summary_cache(remotes: Vec<Remote>) -> Result<(), Er
status: NodeUpdateStatus::Error,
status_message: Some(format!("{err:#}")),
versions: Vec::new(),
+ repository_status: ProductRepositoryStatus::Error,
},
);
log::error!(
@@ -273,10 +276,19 @@ async fn fetch_available_updates(
.map(map_pve_package_version)
.collect();
+ let repos = client.get_apt_repositories(&node).await?;
+ let subscription_info = client.get_subscription(&node).await?;
+
+ let has_active_subscription =
+ subscription_info.status == pve_api_types::NodeSubscriptionInfoStatus::Active;
+
+ let repository_status = check_repository_status(&repos, has_active_subscription);
+
Ok(NodeUpdateInfo {
last_refresh: proxmox_time::epoch_i64(),
updates,
versions,
+ repository_status,
})
}
RemoteType::Pbs => {
@@ -290,10 +302,19 @@ async fn fetch_available_updates(
.map(map_pbs_package_version)
.collect();
+ let repos = client.get_apt_repositories().await?;
+ let subscription_info = client.get_subscription().await?;
+
+ let has_active_subscription =
+ subscription_info.status == proxmox_subscription::SubscriptionStatus::Active;
+
+ let repository_status = check_repository_status(&repos, has_active_subscription);
+
Ok(NodeUpdateInfo {
last_refresh: proxmox_time::epoch_i64(),
updates,
versions,
+ repository_status,
})
}
}
@@ -327,3 +348,55 @@ fn map_pbs_package_version(info: pbs_api_types::APTUpdateInfo) -> PackageVersion
version: info.old_version.unwrap_or_default(),
}
}
+
+fn check_repository_status(
+ config: &APTRepositoriesResult,
+ active_subscription: bool,
+) -> ProductRepositoryStatus {
+ if !config.errors.is_empty() {
+ return ProductRepositoryStatus::Error;
+ }
+
+ let mut has_enterprise = false;
+ let mut has_no_subscription = false;
+ let mut has_test = false;
+ let mut has_ceph_enterprise = false;
+ let mut has_ceph_no_subscription = false;
+ let mut has_ceph_test = false;
+
+ for repo in &config.standard_repos {
+ if repo.status != Some(true) {
+ continue;
+ }
+ match repo.handle {
+ APTRepositoryHandle::CephSquidEnterprise => has_ceph_enterprise = true,
+ APTRepositoryHandle::CephSquidNoSubscription => has_ceph_no_subscription = true,
+ APTRepositoryHandle::CephSquidTest => has_ceph_test = true,
+ APTRepositoryHandle::Enterprise => has_enterprise = true,
+ APTRepositoryHandle::NoSubscription => has_no_subscription = true,
+ APTRepositoryHandle::Test => has_test = true,
+ }
+ }
+
+ if !(has_enterprise | has_no_subscription | has_test) {
+ return ProductRepositoryStatus::NoProductRepository;
+ }
+
+ if has_enterprise && !active_subscription {
+ return ProductRepositoryStatus::MissingSubscriptionForEnterprise;
+ }
+
+ if has_ceph_enterprise && !active_subscription {
+ return ProductRepositoryStatus::MissingSubscriptionForEnterprise;
+ }
+
+ if has_test || has_no_subscription {
+ return ProductRepositoryStatus::NonProductionReady;
+ }
+
+ if has_ceph_no_subscription || has_ceph_test {
+ return ProductRepositoryStatus::NonProductionReady;
+ }
+
+ ProductRepositoryStatus::Ok
+}
--
2.47.3
More information about the pdm-devel
mailing list