public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pbs-devel] [PATCH proxmox-backup stable-3] fixup type move from pbs-api-types to proxmox-network-api
@ 2025-08-13  8:19 Dominik Csapak
  2025-08-13  8:43 ` Stefan Hanreich
  2025-08-13  9:29 ` [pbs-devel] applied: " Fabian Grünbichler
  0 siblings, 2 replies; 3+ messages in thread
From: Dominik Csapak @ 2025-08-13  8:19 UTC (permalink / raw)
  To: pbs-devel

some types moved crate, so adapt here to the correct location, otherwise
it'll not build with newer pbs-api-types on bookworm

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 Cargo.toml                    |  2 ++
 pbs-config/Cargo.toml         |  1 +
 pbs-config/src/network/mod.rs |  2 +-
 src/api2/node/network.rs      | 12 ++++++++----
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index aad0872a4..167f18cf5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,6 +69,7 @@ proxmox-lang = "1.1"
 proxmox-log = "0.2.6"
 proxmox-ldap = "0.2.1"
 proxmox-metrics = "0.3.1"
+proxmox-network-api = "0.1.5"
 proxmox-notify = "0.5.1"
 proxmox-openid = "0.10.0"
 proxmox-rest-server = { version = "0.8.9", features = [ "templates" ] }
@@ -216,6 +217,7 @@ proxmox-lang.workspace = true
 proxmox-log.workspace = true
 proxmox-ldap.workspace = true
 proxmox-metrics.workspace = true
+proxmox-network-api.workspace = true
 proxmox-notify = { workspace = true, features = [ "pbs-context" ] }
 proxmox-openid.workspace = true
 proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] }
diff --git a/pbs-config/Cargo.toml b/pbs-config/Cargo.toml
index 284149658..7da26edae 100644
--- a/pbs-config/Cargo.toml
+++ b/pbs-config/Cargo.toml
@@ -18,6 +18,7 @@ serde.workspace = true
 serde_json.workspace = true
 
 proxmox-notify.workspace = true
+proxmox-network-api.workspace = true
 proxmox-router = { workspace = true, default-features = false }
 proxmox-schema.workspace = true
 proxmox-section-config.workspace = true
diff --git a/pbs-config/src/network/mod.rs b/pbs-config/src/network/mod.rs
index 21ad99434..c53a06204 100644
--- a/pbs-config/src/network/mod.rs
+++ b/pbs-config/src/network/mod.rs
@@ -17,7 +17,7 @@ pub use lexer::*;
 mod parser;
 pub use parser::*;
 
-use pbs_api_types::{
+use proxmox_network_api::{
     BondXmitHashPolicy, Interface, LinuxBondMode, NetworkConfigMethod, NetworkInterfaceType,
 };
 
diff --git a/src/api2/node/network.rs b/src/api2/node/network.rs
index 273751c4a..f6fda1553 100644
--- a/src/api2/node/network.rs
+++ b/src/api2/node/network.rs
@@ -7,11 +7,15 @@ use proxmox_router::{ApiMethod, Permission, Router, RpcEnvironment};
 use proxmox_schema::api;
 
 use pbs_api_types::{
-    Authid, BondXmitHashPolicy, Interface, LinuxBondMode, NetworkConfigMethod,
-    NetworkInterfaceType, CIDR_V4_SCHEMA, CIDR_V6_SCHEMA, IP_V4_SCHEMA, IP_V6_SCHEMA,
-    NETWORK_INTERFACE_ARRAY_SCHEMA, NETWORK_INTERFACE_LIST_SCHEMA, NETWORK_INTERFACE_NAME_SCHEMA,
-    NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, PROXMOX_CONFIG_DIGEST_SCHEMA,
+    Authid, NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, PROXMOX_CONFIG_DIGEST_SCHEMA,
 };
+
+use proxmox_network_api::{
+    BondXmitHashPolicy, Interface, LinuxBondMode, NetworkConfigMethod, NetworkInterfaceType,
+    CIDR_V4_SCHEMA, CIDR_V6_SCHEMA, IP_V4_SCHEMA, IP_V6_SCHEMA, NETWORK_INTERFACE_ARRAY_SCHEMA,
+    NETWORK_INTERFACE_LIST_SCHEMA, NETWORK_INTERFACE_NAME_SCHEMA,
+};
+
 use pbs_config::network::{
     self, parse_vlan_id_from_name, parse_vlan_raw_device_from_name, NetworkConfig,
 };
-- 
2.39.5



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


^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [pbs-devel] [PATCH proxmox-backup stable-3] fixup type move from pbs-api-types to proxmox-network-api
  2025-08-13  8:19 [pbs-devel] [PATCH proxmox-backup stable-3] fixup type move from pbs-api-types to proxmox-network-api Dominik Csapak
@ 2025-08-13  8:43 ` Stefan Hanreich
  2025-08-13  9:29 ` [pbs-devel] applied: " Fabian Grünbichler
  1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hanreich @ 2025-08-13  8:43 UTC (permalink / raw)
  To: Proxmox Backup Server development discussion, Dominik Csapak

successfully built proxmox-backup again with this patch, so consider this:

Tested-by: Stefan Hanreich <s.hanreich@proxmox.com>

On 8/13/25 10:20 AM, Dominik Csapak wrote:
> some types moved crate, so adapt here to the correct location, otherwise
> it'll not build with newer pbs-api-types on bookworm
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  Cargo.toml                    |  2 ++
>  pbs-config/Cargo.toml         |  1 +
>  pbs-config/src/network/mod.rs |  2 +-
>  src/api2/node/network.rs      | 12 ++++++++----
>  4 files changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/Cargo.toml b/Cargo.toml
> index aad0872a4..167f18cf5 100644
> --- a/Cargo.toml
> +++ b/Cargo.toml
> @@ -69,6 +69,7 @@ proxmox-lang = "1.1"
>  proxmox-log = "0.2.6"
>  proxmox-ldap = "0.2.1"
>  proxmox-metrics = "0.3.1"
> +proxmox-network-api = "0.1.5"
>  proxmox-notify = "0.5.1"
>  proxmox-openid = "0.10.0"
>  proxmox-rest-server = { version = "0.8.9", features = [ "templates" ] }
> @@ -216,6 +217,7 @@ proxmox-lang.workspace = true
>  proxmox-log.workspace = true
>  proxmox-ldap.workspace = true
>  proxmox-metrics.workspace = true
> +proxmox-network-api.workspace = true
>  proxmox-notify = { workspace = true, features = [ "pbs-context" ] }
>  proxmox-openid.workspace = true
>  proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] }
> diff --git a/pbs-config/Cargo.toml b/pbs-config/Cargo.toml
> index 284149658..7da26edae 100644
> --- a/pbs-config/Cargo.toml
> +++ b/pbs-config/Cargo.toml
> @@ -18,6 +18,7 @@ serde.workspace = true
>  serde_json.workspace = true
>  
>  proxmox-notify.workspace = true
> +proxmox-network-api.workspace = true
>  proxmox-router = { workspace = true, default-features = false }
>  proxmox-schema.workspace = true
>  proxmox-section-config.workspace = true
> diff --git a/pbs-config/src/network/mod.rs b/pbs-config/src/network/mod.rs
> index 21ad99434..c53a06204 100644
> --- a/pbs-config/src/network/mod.rs
> +++ b/pbs-config/src/network/mod.rs
> @@ -17,7 +17,7 @@ pub use lexer::*;
>  mod parser;
>  pub use parser::*;
>  
> -use pbs_api_types::{
> +use proxmox_network_api::{
>      BondXmitHashPolicy, Interface, LinuxBondMode, NetworkConfigMethod, NetworkInterfaceType,
>  };
>  
> diff --git a/src/api2/node/network.rs b/src/api2/node/network.rs
> index 273751c4a..f6fda1553 100644
> --- a/src/api2/node/network.rs
> +++ b/src/api2/node/network.rs
> @@ -7,11 +7,15 @@ use proxmox_router::{ApiMethod, Permission, Router, RpcEnvironment};
>  use proxmox_schema::api;
>  
>  use pbs_api_types::{
> -    Authid, BondXmitHashPolicy, Interface, LinuxBondMode, NetworkConfigMethod,
> -    NetworkInterfaceType, CIDR_V4_SCHEMA, CIDR_V6_SCHEMA, IP_V4_SCHEMA, IP_V6_SCHEMA,
> -    NETWORK_INTERFACE_ARRAY_SCHEMA, NETWORK_INTERFACE_LIST_SCHEMA, NETWORK_INTERFACE_NAME_SCHEMA,
> -    NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, PROXMOX_CONFIG_DIGEST_SCHEMA,
> +    Authid, NODE_SCHEMA, PRIV_SYS_AUDIT, PRIV_SYS_MODIFY, PROXMOX_CONFIG_DIGEST_SCHEMA,
>  };
> +
> +use proxmox_network_api::{
> +    BondXmitHashPolicy, Interface, LinuxBondMode, NetworkConfigMethod, NetworkInterfaceType,
> +    CIDR_V4_SCHEMA, CIDR_V6_SCHEMA, IP_V4_SCHEMA, IP_V6_SCHEMA, NETWORK_INTERFACE_ARRAY_SCHEMA,
> +    NETWORK_INTERFACE_LIST_SCHEMA, NETWORK_INTERFACE_NAME_SCHEMA,
> +};
> +
>  use pbs_config::network::{
>      self, parse_vlan_id_from_name, parse_vlan_raw_device_from_name, NetworkConfig,
>  };



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


^ permalink raw reply	[flat|nested] 3+ messages in thread
* [pbs-devel] applied: [PATCH proxmox-backup stable-3] fixup type move from pbs-api-types to proxmox-network-api
  2025-08-13  8:19 [pbs-devel] [PATCH proxmox-backup stable-3] fixup type move from pbs-api-types to proxmox-network-api Dominik Csapak
  2025-08-13  8:43 ` Stefan Hanreich
@ 2025-08-13  9:29 ` Fabian Grünbichler
  1 sibling, 0 replies; 3+ messages in thread
From: Fabian Grünbichler @ 2025-08-13  9:29 UTC (permalink / raw)
  To: pbs-devel, Dominik Csapak


On Wed, 13 Aug 2025 10:19:59 +0200, Dominik Csapak wrote:
> some types moved crate, so adapt here to the correct location, otherwise
> it'll not build with newer pbs-api-types on bookworm
> 
> 

Applied with a follow-up bumping the version and adding the crate to d/control,
thanks!

[1/1] fixup type move from pbs-api-types to proxmox-network-api
      commit: d41a83268bfb0168527c897805fe829a62f95ff4

Best regards,
-- 
Fabian Grünbichler <f.gruenbichler@proxmox.com>


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

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-08-13  9:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-08-13  8:19 [pbs-devel] [PATCH proxmox-backup stable-3] fixup type move from pbs-api-types to proxmox-network-api Dominik Csapak
2025-08-13  8:43 ` Stefan Hanreich
2025-08-13  9:29 ` [pbs-devel] applied: " Fabian Grünbichler

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