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 DC6531FF183 for ; Wed, 13 Aug 2025 10:18:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2549B1E8A9; Wed, 13 Aug 2025 10:20:32 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 13 Aug 2025 10:19:59 +0200 Message-Id: <20250813081959.1112692-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 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 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. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches 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. [mod.rs, network.rs] Subject: [pbs-devel] [PATCH proxmox-backup stable-3] fixup type move from pbs-api-types to proxmox-network-api X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "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 --- 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