[pdm-devel] [PATCH proxmox-datacenter-manager 1/2] pdm: rename ListFirewallRules to FirewallRule

[Hannes Laimer <h.laimer@proxmox.com>]

Adjust to the rename in pve-api-types.

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 lib/pdm-client/src/lib.rs      |  8 ++++----
 server/src/api/pve/firewall.rs | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/pdm-client/src/lib.rs b/lib/pdm-client/src/lib.rs
index 01ee6f7..9467142 100644
--- a/lib/pdm-client/src/lib.rs
+++ b/lib/pdm-client/src/lib.rs
@@ -475,7 +475,7 @@ impl<T: HttpApiClient> PdmClient<T> {
     pub async fn pve_get_cluster_firewall_rules(
         &self,
         remote: &str,
-    ) -> Result<Vec<pve_api_types::ListFirewallRules>, Error> {
+    ) -> Result<Vec<pve_api_types::FirewallRule>, Error> {
         let path = format!("/api2/extjs/pve/remotes/{remote}/firewall/rules");
         Ok(self.0.get(&path).await?.expect_json()?.data)
     }
@@ -484,7 +484,7 @@ impl<T: HttpApiClient> PdmClient<T> {
         &self,
         remote: &str,
         node: &str,
-    ) -> Result<Vec<pve_api_types::ListFirewallRules>, Error> {
+    ) -> Result<Vec<pve_api_types::FirewallRule>, Error> {
         let path = format!("/api2/extjs/pve/remotes/{remote}/nodes/{node}/firewall/rules");
         Ok(self.0.get(&path).await?.expect_json()?.data)
     }
@@ -494,7 +494,7 @@ impl<T: HttpApiClient> PdmClient<T> {
         remote: &str,
         node: Option<&str>,
         vmid: u32,
-    ) -> Result<Vec<pve_api_types::ListFirewallRules>, Error> {
+    ) -> Result<Vec<pve_api_types::FirewallRule>, Error> {
         let path = ApiPathBuilder::new(format!(
             "/api2/extjs/pve/remotes/{remote}/lxc/{vmid}/firewall/rules"
         ))
@@ -508,7 +508,7 @@ impl<T: HttpApiClient> PdmClient<T> {
         remote: &str,
         node: Option<&str>,
         vmid: u32,
-    ) -> Result<Vec<pve_api_types::ListFirewallRules>, Error> {
+    ) -> Result<Vec<pve_api_types::FirewallRule>, Error> {
         let path = ApiPathBuilder::new(format!(
             "/api2/extjs/pve/remotes/{remote}/qemu/{vmid}/firewall/rules"
         ))
diff --git a/server/src/api/pve/firewall.rs b/server/src/api/pve/firewall.rs
index af11d58..e60961c 100644
--- a/server/src/api/pve/firewall.rs
+++ b/server/src/api/pve/firewall.rs
@@ -529,7 +529,7 @@ pub async fn node_firewall_status(
     returns: {
         type: Array,
         description: "List cluster firewall rules.",
-        items: { type: pve_api_types::ListFirewallRules },
+        items: { type: pve_api_types::FirewallRule },
     },
     access: {
         permission: &Permission::Privilege(&["resource", "{remote}"], PRIV_RESOURCE_AUDIT, false),
@@ -539,7 +539,7 @@ pub async fn node_firewall_status(
 pub async fn cluster_firewall_rules(
     remote: String,
     _rpcenv: &mut dyn RpcEnvironment,
-) -> Result<Vec<pve_api_types::ListFirewallRules>, Error> {
+) -> Result<Vec<pve_api_types::FirewallRule>, Error> {
     let (remotes, _) = pdm_config::remotes::config()?;
     let pve = connect_to_remote(&remotes, &remote)?;
 
@@ -646,7 +646,7 @@ pub async fn update_node_firewall_options(
     returns: {
         type: Array,
         description: "List node firewall rules.",
-        items: { type: pve_api_types::ListFirewallRules },
+        items: { type: pve_api_types::FirewallRule },
     },
     access: {
         permission: &Permission::Privilege(&["resource", "{remote}"], PRIV_RESOURCE_AUDIT, false),
@@ -657,7 +657,7 @@ pub async fn node_firewall_rules(
     remote: String,
     node: String,
     _rpcenv: &mut dyn RpcEnvironment,
-) -> Result<Vec<pve_api_types::ListFirewallRules>, Error> {
+) -> Result<Vec<pve_api_types::FirewallRule>, Error> {
     let (remotes, _) = pdm_config::remotes::config()?;
     let pve = connect_to_remote(&remotes, &remote)?;
 
@@ -782,7 +782,7 @@ pub async fn update_qemu_firewall_options(
     returns: {
         type: Array,
         description: "List LXC firewall rules.",
-        items: { type: pve_api_types::ListFirewallRules },
+        items: { type: pve_api_types::FirewallRule },
     },
     access: {
         permission: &Permission::Privilege(&["resource", "{remote}", "guest", "{vmid}"], PRIV_RESOURCE_AUDIT, false),
@@ -794,7 +794,7 @@ pub async fn lxc_firewall_rules(
     node: Option<String>,
     vmid: u32,
     _rpcenv: &mut dyn RpcEnvironment,
-) -> Result<Vec<pve_api_types::ListFirewallRules>, Error> {
+) -> Result<Vec<pve_api_types::FirewallRule>, Error> {
     let (remotes, _) = pdm_config::remotes::config()?;
 
     let pve = connect_to_remote(&remotes, &remote)?;
@@ -818,7 +818,7 @@ pub async fn lxc_firewall_rules(
     returns: {
         type: Array,
         description: "List QEMU firewall rules.",
-        items: { type: pve_api_types::ListFirewallRules },
+        items: { type: pve_api_types::FirewallRule },
     },
     access: {
         permission: &Permission::Privilege(&["resource", "{remote}", "guest", "{vmid}"], PRIV_RESOURCE_AUDIT, false),
@@ -830,7 +830,7 @@ pub async fn qemu_firewall_rules(
     node: Option<String>,
     vmid: u32,
     _rpcenv: &mut dyn RpcEnvironment,
-) -> Result<Vec<pve_api_types::ListFirewallRules>, Error> {
+) -> Result<Vec<pve_api_types::FirewallRule>, Error> {
     let (remotes, _) = pdm_config::remotes::config()?;
 
     let pve = connect_to_remote(&remotes, &remote)?;
-- 
2.47.3



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel