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 9B1961FF16F for ; Tue, 2 Sep 2025 16:18:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DC5641656F; Tue, 2 Sep 2025 16:18:37 +0200 (CEST) From: Stefan Hanreich To: pdm-devel@lists.proxmox.com Date: Tue, 2 Sep 2025 16:09:45 +0200 Message-ID: <20250902140956.228031-22-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250902140956.228031-1-s.hanreich@proxmox.com> References: <20250902140956.228031-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.189 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lib.rs, sdn.rs, vnets.rs] Subject: [pdm-devel] [PATCH proxmox-datacenter-manager v3 06/15] api: sdn: add create_vnet endpoint 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" This endpoint is used for creating a new EVPN vnet on multiple remotes. It utilizes the newly introduced LockSdnClients helper for performing the action simultaneously across all remotes and rolling back in case of failure. Signed-off-by: Stefan Hanreich --- lib/pdm-api-types/src/sdn.rs | 45 ++++++++++++++++++++ lib/pdm-client/src/lib.rs | 8 +++- server/src/api/sdn/vnets.rs | 81 ++++++++++++++++++++++++++++++++++-- 3 files changed, 129 insertions(+), 5 deletions(-) diff --git a/lib/pdm-api-types/src/sdn.rs b/lib/pdm-api-types/src/sdn.rs index ac27106..79a6357 100644 --- a/lib/pdm-api-types/src/sdn.rs +++ b/lib/pdm-api-types/src/sdn.rs @@ -65,6 +65,51 @@ pub struct CreateZoneParams { pub remotes: Vec, } +#[api( + properties: { + remote: { + schema: REMOTE_ID_SCHEMA, + }, + zone: { + schema: SDN_ID_SCHEMA, + }, + } +)] +/// Describes the remote-specific informations for creating a new vnet. +#[derive(Clone, Debug, Serialize, Deserialize)] +#[serde(rename_all = "kebab-case")] +pub struct CreateVnetRemote { + pub remote: String, + pub zone: String, +} + +#[api( + properties: { + tag: { + schema: VXLAN_ID_SCHEMA, + }, + remotes: { + type: Array, + description: "List of remotes and the zones in which the vnet should get created.", + items: { + type: CreateVnetRemote, + } + }, + vnet: { + schema: SDN_ID_SCHEMA, + }, + } +)] +/// Contains the information for creating a new vnet as well as information about the remotes where +/// the vnet should get created. +#[derive(Clone, Debug, Serialize, Deserialize)] +#[serde(rename_all = "kebab-case")] +pub struct CreateVnetParams { + pub tag: u32, + pub vnet: String, + pub remotes: Vec, +} + #[api( properties: { remote: { diff --git a/lib/pdm-client/src/lib.rs b/lib/pdm-client/src/lib.rs index 37961be..a17a045 100644 --- a/lib/pdm-client/src/lib.rs +++ b/lib/pdm-client/src/lib.rs @@ -59,7 +59,7 @@ pub mod types { pub use pve_api_types::PveUpid; - pub use pdm_api_types::sdn::{CreateZoneParams, ListZone}; + pub use pdm_api_types::sdn::{CreateVnetParams, CreateZoneParams, ListVnet, ListZone}; pub use pve_api_types::ListZonesType; } @@ -1004,6 +1004,12 @@ impl PdmClient { Ok(self.0.post(path, ¶ms).await?.expect_json()?.data) } + + pub async fn pve_sdn_create_vnet(&self, params: CreateVnetParams) -> Result { + let path = "/api2/extjs/sdn/vnets"; + + Ok(self.0.post(path, ¶ms).await?.expect_json()?.data) + } } /// Builder for migration parameters. diff --git a/server/src/api/sdn/vnets.rs b/server/src/api/sdn/vnets.rs index 899c486..a8092cf 100644 --- a/server/src/api/sdn/vnets.rs +++ b/server/src/api/sdn/vnets.rs @@ -1,11 +1,16 @@ use std::collections::HashSet; use anyhow::{format_err, Error}; - use pbs_api_types::REMOTE_ID_SCHEMA; -use pdm_api_types::{remotes::RemoteType, sdn::ListVnet}; -use proxmox_router::Router; +use pdm_api_types::{ + remotes::RemoteType, + sdn::{CreateVnetRemote, ListVnet, SDN_ID_SCHEMA, VXLAN_ID_SCHEMA}, + Authid, +}; +use proxmox_rest_server::WorkerTask; +use proxmox_router::{Router, RpcEnvironment}; use proxmox_schema::api; +use pve_api_types::{CreateVnet, SdnVnetType}; use crate::{ api::pve, @@ -13,7 +18,9 @@ use crate::{ sdn_client::LockedSdnClients, }; -pub const ROUTER: Router = Router::new().get(&API_METHOD_LIST_VNETS); +pub const ROUTER: Router = Router::new() + .get(&API_METHOD_LIST_VNETS) + .post(&API_METHOD_CREATE_VNET); #[api( input: { @@ -105,3 +112,69 @@ async fn list_vnets( Ok(vnets) } + +#[api( + input: { + properties: { + vnet: { schema: SDN_ID_SCHEMA }, + tag: { schema: VXLAN_ID_SCHEMA, optional: true }, + remotes: { + type: Array, + description: "List of remotes with the zone in which the VNet should get created.", + items: { + type: CreateVnetRemote, + } + }, + }, + }, + returns: { type: String, description: "Worker UPID" }, +)] +/// Create a VNet across multiple remotes +async fn create_vnet( + vnet: String, + tag: Option, + remotes: Vec, + rpcenv: &mut dyn RpcEnvironment, +) -> Result { + let auth_id: Authid = rpcenv + .get_auth_id() + .ok_or_else(|| format_err!("no authid available"))? + .parse()?; + + let upid = WorkerTask::spawn( + "create_vnet", + None, + auth_id.to_string(), + false, + move |_worker| async move { + LockedSdnClients::from_remote_names( + remotes + .into_iter() + .map(|remote| (remote.remote.clone(), remote)), + false, + ) + .await? + .for_each(async move |client, ctx| { + proxmox_log::info!("creating vnet {} on remote {}", vnet, ctx.remote_id()); + + let params = CreateVnet { + alias: None, + isolate_ports: None, + tag, + ty: Some(SdnVnetType::Vnet), + vlanaware: None, + vnet: vnet.to_string(), + zone: ctx.data().zone.clone(), + lock_token: None, + }; + + client.create_vnet(params).await + }) + .await? + .apply_and_release() + .await + }, + )?; + + Ok(upid) +} -- 2.47.2 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel