[pdm-devel] [PATCH proxmox-datacenter-manager 04/13] api: sdn: add list_vnets endpoint
Stefan Hanreich
s.hanreich at proxmox.com
Fri Feb 28 16:17:54 CET 2025
Add an endpoint for listing the vnets of all configured PVE remotes.
They can be filtered by type / remote and it exposes options for
querying the pending / running configuration.
This call is quite expensive, since it makes a GET call to every
configured PVE remote, which can take awhile depending on the network
connection. For the future we might want to introduce a caching
mechanism for this call.
Signed-off-by: Stefan Hanreich <s.hanreich at proxmox.com>
---
lib/pdm-api-types/src/sdn.rs | 21 ++++++++++-
lib/pdm-client/src/lib.rs | 16 +++++++-
server/src/api/sdn/mod.rs | 2 +
server/src/api/sdn/vnets.rs | 72 ++++++++++++++++++++++++++++++++++++
4 files changed, 109 insertions(+), 2 deletions(-)
create mode 100644 server/src/api/sdn/vnets.rs
diff --git a/lib/pdm-api-types/src/sdn.rs b/lib/pdm-api-types/src/sdn.rs
index 2f72bca..e944d60 100644
--- a/lib/pdm-api-types/src/sdn.rs
+++ b/lib/pdm-api-types/src/sdn.rs
@@ -1,5 +1,5 @@
use proxmox_schema::{api, const_regex, ApiStringFormat, IntegerSchema, Schema, StringSchema};
-use pve_api_types::SdnZone;
+use pve_api_types::{SdnVnet, SdnZone};
use serde::{Deserialize, Serialize};
use crate::remotes::REMOTE_ID_SCHEMA;
@@ -65,6 +65,25 @@ pub struct CreateZoneParams {
pub remotes: Vec<CreateZoneRemote>,
}
+#[api(
+ properties: {
+ remote: {
+ schema: REMOTE_ID_SCHEMA,
+ },
+ vnet: {
+ type: pve_api_types::SdnVnet,
+ flatten: true,
+ }
+ }
+)]
+/// SDN controller with additional information about which remote it belongs to
+#[derive(Serialize, Deserialize, Clone, PartialEq)]
+pub struct ListVnet {
+ pub remote: String,
+ #[serde(flatten)]
+ pub vnet: SdnVnet,
+}
+
#[api(
properties: {
remote: {
diff --git a/lib/pdm-client/src/lib.rs b/lib/pdm-client/src/lib.rs
index bd6ca63..42ea7b1 100644
--- a/lib/pdm-client/src/lib.rs
+++ b/lib/pdm-client/src/lib.rs
@@ -7,7 +7,7 @@ use pdm_api_types::resource::{PveResource, RemoteResources, TopEntities};
use pdm_api_types::rrddata::{
LxcDataPoint, NodeDataPoint, PbsDatastoreDataPoint, PbsNodeDataPoint, QemuDataPoint,
};
-use pdm_api_types::sdn::ListZone;
+use pdm_api_types::sdn::{ListVnet, ListZone};
use pdm_api_types::BasicRealmInfo;
use pve_api_types::StartQemuMigrationType;
use serde::{Deserialize, Serialize};
@@ -863,6 +863,20 @@ impl<T: HttpApiClient> PdmClient<T> {
Ok(self.0.get(&path).await?.expect_json()?.data)
}
+ pub async fn pve_sdn_list_vnets(
+ &self,
+ pending: impl Into<Option<bool>>,
+ running: impl Into<Option<bool>>,
+ ) -> Result<Vec<ListVnet>, Error> {
+ let mut path = "/api2/extjs/sdn/vnets".to_string();
+
+ let mut sep = '?';
+ add_query_arg(&mut path, &mut sep, "pending", &pending.into());
+ add_query_arg(&mut path, &mut sep, "running", &running.into());
+
+ Ok(self.0.get(&path).await?.expect_json()?.data)
+ }
+
pub async fn pve_sdn_create_zone(&self, params: CreateZoneParams) -> Result<String, Error> {
let path = "/api2/extjs/sdn/zones";
diff --git a/server/src/api/sdn/mod.rs b/server/src/api/sdn/mod.rs
index 2abdaf6..ccf7123 100644
--- a/server/src/api/sdn/mod.rs
+++ b/server/src/api/sdn/mod.rs
@@ -1,10 +1,12 @@
use proxmox_router::{list_subdirs_api_method, Router, SubdirMap};
use proxmox_sortable_macro::sortable;
+pub mod vnets;
pub mod zones;
#[sortable]
pub const SUBDIRS: SubdirMap = &sorted!([
+ ("vnets", &vnets::ROUTER),
("zones", &zones::ROUTER),
]);
diff --git a/server/src/api/sdn/vnets.rs b/server/src/api/sdn/vnets.rs
new file mode 100644
index 0000000..2ac2956
--- /dev/null
+++ b/server/src/api/sdn/vnets.rs
@@ -0,0 +1,72 @@
+use anyhow::Error;
+use pbs_api_types::REMOTE_ID_SCHEMA;
+use pdm_api_types::{remotes::RemoteType, sdn::ListVnet};
+use proxmox_router::Router;
+use proxmox_schema::api;
+
+use crate::api::pve::{connect, get_remote};
+
+pub const ROUTER: Router = Router::new().get(&API_METHOD_LIST_VNETS);
+
+#[api(
+ input: {
+ properties: {
+ pending: {
+ type: Boolean,
+ optional: true,
+ description: "Include a list of attributes whose changes are currently pending.",
+ },
+ running: {
+ type: Boolean,
+ optional: true,
+ description: "If true shows the running configuration, otherwise the pending configuration.",
+ },
+ remotes: {
+ type: Array,
+ optional: true,
+ description: "Only return controllers from the specified remotes.",
+ items: {
+ schema: REMOTE_ID_SCHEMA,
+ }
+ },
+ }
+ },
+ returns: {
+ type: Array,
+ description: "Get a list of controllers fitting the filtering criteria.",
+ items: {
+ type: ListVnet,
+ },
+ },
+)]
+/// Query VNets of PVE remotes with optional filtering options
+async fn list_vnets(
+ pending: Option<bool>,
+ running: Option<bool>,
+ remotes: Option<Vec<String>>,
+) -> Result<Vec<ListVnet>, Error> {
+ let (remote_config, _) = pdm_config::remotes::config()?;
+
+ let remote_ids = remotes.unwrap_or_else(|| {
+ remote_config
+ .values()
+ .filter(|remote| (remote.ty == RemoteType::Pve))
+ .map(|remote| remote.id.clone())
+ .collect()
+ });
+
+ let mut result = Vec::new();
+
+ for remote in remote_ids {
+ let client = connect(get_remote(&remote_config, &remote)?)?;
+
+ for vnet in client.list_vnets(pending, running).await? {
+ result.push(ListVnet {
+ remote: remote.clone(),
+ vnet,
+ })
+ }
+ }
+
+ Ok(result)
+}
--
2.39.5
More information about the pdm-devel
mailing list