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 12E361FF13C for ; Thu, 19 Feb 2026 15:57:35 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C5A6B19117; Thu, 19 Feb 2026 15:57:24 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox 2/2] wireguard: implement ApiType for endpoints and hostnames Date: Thu, 19 Feb 2026 15:56:19 +0100 Message-ID: <20260219145649.441418-3-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260219145649.441418-1-s.hanreich@proxmox.com> References: <20260219145649.441418-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.177 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Message-ID-Hash: GGYLDCB6SWGCZMNRW443ZRIC55PJEUHU X-Message-ID-Hash: GGYLDCB6SWGCZMNRW443ZRIC55PJEUHU X-MailFrom: hoan@cray.proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This allows those types to be used in the section config types for the wireguard fabric, as well as in the API definitions for them. Signed-off-by: Stefan Hanreich --- proxmox-network-types/src/endpoint.rs | 30 +++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/proxmox-network-types/src/endpoint.rs b/proxmox-network-types/src/endpoint.rs index 24e33c7f..a6a209e2 100644 --- a/proxmox-network-types/src/endpoint.rs +++ b/proxmox-network-types/src/endpoint.rs @@ -7,13 +7,19 @@ use std::{ str::FromStr, }; +#[cfg(feature = "api-types")] +use proxmox_schema::StringSchema; +#[cfg(feature = "api-types")] +use proxmox_schema::{ApiType, Updater, UpdaterType}; +use serde::{Deserialize, Serialize}; use serde_with::{DeserializeFromStr, SerializeDisplay}; /// Represents either a resolvable hostname or an IPv4/IPv6 address. /// IPv6 address are correctly bracketed on [`Display`], and parsing /// automatically tries parsing it as an IP address first, falling back to a /// plain hostname in the other case. -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug, PartialEq, Hash, Deserialize, Serialize)] +#[serde(untagged)] pub enum HostnameOrIpAddr { Hostname(String), IpAddr(IpAddr), @@ -42,9 +48,19 @@ impl> From for HostnameOrIpAddr { } } +#[cfg(feature = "api-types")] +impl ApiType for HostnameOrIpAddr { + const API_SCHEMA: proxmox_schema::Schema = StringSchema::new("hostname or ip address").schema(); +} + +#[cfg(feature = "api-types")] +impl UpdaterType for HostnameOrIpAddr { + type Updater = Option; +} + /// Represents a (host, port) tuple, where the host can either be a resolvable /// hostname or an IPv4/IPv6 address. -#[derive(Clone, Debug, PartialEq, SerializeDisplay, DeserializeFromStr)] +#[derive(Clone, Debug, PartialEq, Hash, SerializeDisplay, DeserializeFromStr)] pub struct ServiceEndpoint { host: HostnameOrIpAddr, port: u16, @@ -99,6 +115,16 @@ impl FromStr for ServiceEndpoint { } } +#[cfg(feature = "api-types")] +impl UpdaterType for ServiceEndpoint { + type Updater = Option; +} + +#[cfg(feature = "api-types")] +impl ApiType for ServiceEndpoint { + const API_SCHEMA: proxmox_schema::Schema = StringSchema::new("service endpoint").schema(); +} + #[cfg(test)] mod tests { use crate::endpoint::HostnameOrIpAddr; -- 2.47.3