From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH proxmox-api-types 08/12] sdn: generate lock endpoints
Date: Fri, 28 Feb 2025 16:17:45 +0100 [thread overview]
Message-ID: <20250228151803.158984-9-s.hanreich@proxmox.com> (raw)
In-Reply-To: <20250228151803.158984-1-s.hanreich@proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
pve-api-types/src/generated/code.rs | 30 ++++++++++++++++++-
pve-api-types/src/generated/types.rs | 44 ++++++++++++++++++++++++++++
2 files changed, 73 insertions(+), 1 deletion(-)
diff --git a/pve-api-types/src/generated/code.rs b/pve-api-types/src/generated/code.rs
index 5283df4..7927ccb 100644
--- a/pve-api-types/src/generated/code.rs
+++ b/pve-api-types/src/generated/code.rs
@@ -115,7 +115,6 @@
/// - /cluster/sdn/ipams
/// - /cluster/sdn/ipams/{ipam}
/// - /cluster/sdn/ipams/{ipam}/status
-/// - /cluster/sdn/lock
/// - /cluster/sdn/rollback
/// - /cluster/sdn/vnets/{vnet}
/// - /cluster/sdn/vnets/{vnet}/firewall
@@ -370,6 +369,11 @@
/// ```
#[async_trait::async_trait]
pub trait PveClient {
+ /// Acquire global lock for SDN configuration
+ async fn acquire_sdn_lock(&self, params: CreateSdnLock) -> Result<String, Error> {
+ Err(Error::Other("acquire_sdn_lock not implemented"))
+ }
+
/// Get information needed to join this cluster over the connected node.
async fn cluster_config_join(&self, node: Option<String>) -> Result<ClusterJoinInfo, Error> {
Err(Error::Other("cluster_config_join not implemented"))
@@ -595,6 +599,11 @@ pub trait PveClient {
Err(Error::Other("qemu_migrate_preconditions not implemented"))
}
+ /// Release global lock for SDN configuration
+ async fn release_sdn_lock(&self, params: ReleaseSdnLock) -> Result<(), Error> {
+ Err(Error::Other("release_sdn_lock not implemented"))
+ }
+
/// Migrate the container to another cluster. Creates a new migration task.
/// EXPERIMENTAL feature!
async fn remote_migrate_lxc(
@@ -701,6 +710,12 @@ where
T: HttpApiClient + Send + Sync,
for<'a> <T as HttpApiClient>::ResponseFuture<'a>: Send,
{
+ /// Acquire global lock for SDN configuration
+ async fn acquire_sdn_lock(&self, params: CreateSdnLock) -> Result<String, Error> {
+ let url = "/api2/extjs/cluster/sdn/lock";
+ Ok(self.0.post(url, ¶ms).await?.expect_json()?.data)
+ }
+
/// Get information needed to join this cluster over the connected node.
async fn cluster_config_join(&self, node: Option<String>) -> Result<ClusterJoinInfo, Error> {
let (mut query, mut sep) = (String::new(), '?');
@@ -1019,6 +1034,19 @@ where
Ok(self.0.get(url).await?.expect_json()?.data)
}
+ /// Release global lock for SDN configuration
+ async fn release_sdn_lock(&self, params: ReleaseSdnLock) -> Result<(), Error> {
+ let (mut query, mut sep) = (String::new(), '?');
+ let ReleaseSdnLock {
+ force: p_force,
+ lock_secret: p_lock_secret,
+ } = params;
+ add_query_bool(&mut query, &mut sep, "force", p_force);
+ add_query_arg(&mut query, &mut sep, "lock-secret", &p_lock_secret);
+ let url = &format!("/api2/extjs/cluster/sdn/lock{query}");
+ self.0.delete(url).await?.nodata()
+ }
+
/// Migrate the container to another cluster. Creates a new migration task.
/// EXPERIMENTAL feature!
async fn remote_migrate_lxc(
diff --git a/pve-api-types/src/generated/types.rs b/pve-api-types/src/generated/types.rs
index 92dc968..78fdbd1 100644
--- a/pve-api-types/src/generated/types.rs
+++ b/pve-api-types/src/generated/types.rs
@@ -964,6 +964,24 @@ pub struct CreateController {
pub ty: ListControllersType,
}
+#[api(
+ properties: {
+ "allow-pending": {
+ default: false,
+ optional: true,
+ },
+ },
+)]
+/// Object.
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub struct CreateSdnLock {
+ /// if true, allow acquiring lock even though there are pending changes
+ #[serde(deserialize_with = "proxmox_login::parse::deserialize_bool")]
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ #[serde(rename = "allow-pending")]
+ pub allow_pending: Option<bool>,
+}
+
#[api(
properties: {
comment: {
@@ -9080,6 +9098,32 @@ pub struct QemuStatus {
pub vmid: u32,
}
+#[api(
+ properties: {
+ force: {
+ default: false,
+ optional: true,
+ },
+ "lock-secret": {
+ optional: true,
+ type: String,
+ },
+ },
+)]
+/// Object.
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub struct ReleaseSdnLock {
+ /// if true, allow releasing lock without providing the secret
+ #[serde(deserialize_with = "proxmox_login::parse::deserialize_bool")]
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub force: Option<bool>,
+
+ /// the secret for unlocking the global SDN configuration
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ #[serde(rename = "lock-secret")]
+ pub lock_secret: Option<String>,
+}
+
#[api(
properties: {
bwlimit: {
--
2.39.5
_______________________________________________
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-02-28 15:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-28 15:17 [pdm-devel] [RFC proxmox{-api-types, -yew-comp, -datacenter-manager} 00/26] Add initial SDN / EVPN integration Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-api-types 01/12] sdn: add list/create zone endpoints Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-api-types 02/12] sdn: generate zones endpoints Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-api-types 03/12] sdn: add list/create vnet endpoints Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-api-types 04/12] sdn: generate " Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-api-types 05/12] sdn: add list/create controller endpoints Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-api-types 06/12] sdn: generate " Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-api-types 07/12] sdn: add acquire/release lock endpoints Stefan Hanreich
2025-02-28 15:17 ` Stefan Hanreich [this message]
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-api-types 09/12] sdn: add apply configuration endpoint Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-api-types 10/12] sdn: generate " Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-api-types 11/12] tasks: add helper for querying successfully finished tasks Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-api-types 12/12] sdn: add helpers for pending values Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-yew-comp 1/1] sdn: add descriptions for sdn tasks Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-datacenter-manager 01/13] server: add locked sdn client and helper methods Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-datacenter-manager 02/13] api: sdn: add list_zones endpoint Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-datacenter-manager 03/13] api: sdn: add create_zone endpoint Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-datacenter-manager 04/13] api: sdn: add list_vnets endpoint Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-datacenter-manager 05/13] api: sdn: add create_vnet endpoint Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-datacenter-manager 06/13] api: sdn: add list_controllers endpoint Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-datacenter-manager 07/13] ui: add VrfTree component Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-datacenter-manager 08/13] ui: sdn: add RouterTable component Stefan Hanreich
2025-02-28 15:17 ` [pdm-devel] [PATCH proxmox-datacenter-manager 09/13] ui: sdn: add AddVnetWindow component Stefan Hanreich
2025-02-28 15:18 ` [pdm-devel] [PATCH proxmox-datacenter-manager 10/13] ui: sdn: add AddZoneWindow component Stefan Hanreich
2025-02-28 15:18 ` [pdm-devel] [PATCH proxmox-datacenter-manager 11/13] ui: sdn: add EvpnPanel Stefan Hanreich
2025-02-28 15:18 ` [pdm-devel] [PATCH proxmox-datacenter-manager 12/13] ui: sdn: add EvpnPanel to main menu Stefan Hanreich
2025-02-28 15:18 ` [pdm-devel] [PATCH proxmox-datacenter-manager 13/13] pve: sdn: add descriptions for sdn tasks Stefan Hanreich
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=20250228151803.158984-9-s.hanreich@proxmox.com \
--to=s.hanreich@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal