From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 6531D1FF15E for ; Tue, 14 Jan 2025 12:22:32 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4F2B813E52; Tue, 14 Jan 2025 12:22:15 +0100 (CET) From: Dominik Csapak To: pdm-devel@lists.proxmox.com Date: Tue, 14 Jan 2025 12:21:38 +0100 Message-Id: <20250114112140.1898658-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250114112140.1898658-1-d.csapak@proxmox.com> References: <20250114112140.1898658-1-d.csapak@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pdm-devel] [PATCH datacenter-manager v2 2/4] pdm-client: add target-endpoint parameter to remote migration methods 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" and set it to None for all users for now Signed-off-by: Dominik Csapak --- changes from v1: * fix cli code to set that parameter to None * also fix UI code in one go so the repo state is compileable cli/client/src/pve.rs | 4 ++-- lib/pdm-client/src/lib.rs | 8 ++++++++ ui/src/widget/migrate_window.rs | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cli/client/src/pve.rs b/cli/client/src/pve.rs index c355293..1b12403 100644 --- a/cli/client/src/pve.rs +++ b/cli/client/src/pve.rs @@ -618,7 +618,7 @@ async fn remote_migrate_qemu( let client = client()?; let upid = client - .pve_qemu_remote_migrate(&remote, node.as_deref(), vmid, target, params) + .pve_qemu_remote_migrate(&remote, node.as_deref(), vmid, target, None, params) .await?; println!("upid: {upid}"); let status = client.pve_wait_for_task(&upid).await?; @@ -996,7 +996,7 @@ async fn remote_migrate_lxc( let client = client()?; let upid = client - .pve_lxc_remote_migrate(&remote, node.as_deref(), vmid, target, params) + .pve_lxc_remote_migrate(&remote, node.as_deref(), vmid, target, None, params) .await?; println!("upid: {upid}"); let status = client.pve_wait_for_task(&upid).await?; diff --git a/lib/pdm-client/src/lib.rs b/lib/pdm-client/src/lib.rs index 4ef560e..1253ded 100644 --- a/lib/pdm-client/src/lib.rs +++ b/lib/pdm-client/src/lib.rs @@ -488,6 +488,7 @@ impl PdmClient { node: Option<&str>, vmid: u32, target: String, + target_endpoint: Option<&str>, params: RemoteMigrateQemu, ) -> Result { let path = format!("/api2/extjs/pve/remotes/{remote}/qemu/{vmid}/remote-migrate"); @@ -496,6 +497,9 @@ impl PdmClient { if let Some(node) = node { request["node"] = node.into(); } + if let Some(target_endpoint) = target_endpoint { + request["target-endpoint"] = target_endpoint.into(); + } Ok(self.0.post(&path, &request).await?.expect_json()?.data) } @@ -581,6 +585,7 @@ impl PdmClient { node: Option<&str>, vmid: u32, target: String, + target_endpoint: Option<&str>, params: RemoteMigrateLxc, ) -> Result { let path = format!("/api2/extjs/pve/remotes/{remote}/lxc/{vmid}/remote-migrate"); @@ -589,6 +594,9 @@ impl PdmClient { if let Some(node) = node { request["node"] = node.into(); } + if let Some(target_endpoint) = target_endpoint { + request["target-endpoint"] = target_endpoint.into(); + } Ok(self.0.post(&path, &request).await?.expect_json()?.data) } diff --git a/ui/src/widget/migrate_window.rs b/ui/src/widget/migrate_window.rs index c87cf9a..42b4e95 100644 --- a/ui/src/widget/migrate_window.rs +++ b/ui/src/widget/migrate_window.rs @@ -174,6 +174,7 @@ impl PdmMigrateWindow { None, guest_info.vmid, target_remote.to_string(), + None, migrate_opts, ) .await? @@ -218,6 +219,7 @@ impl PdmMigrateWindow { None, guest_info.vmid, target_remote.to_string(), + None, migrate_opts, ) .await? -- 2.39.5 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel