From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox v2 02/25] wireguard: implement ApiType for endpoints and hostnames
Date: Thu, 2 Apr 2026 10:11:22 +0200 [thread overview]
Message-ID: <20260402081148.76276-3-s.hanreich@proxmox.com> (raw)
In-Reply-To: <20260402081148.76276-1-s.hanreich@proxmox.com>
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 <s.hanreich@proxmox.com>
---
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 10f6a813..16918f0d 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<S: Into<String>> From<S> 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<Self>;
+}
+
/// 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<Self>;
+}
+
+#[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
next prev parent reply other threads:[~2026-04-02 8:11 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-02 8:11 [RFC manager/network/proxmox{,-ve-rs,-perl-rs} v2 00/25] Add WireGuard as protocol to SDN fabrics Stefan Hanreich
2026-04-02 8:11 ` [PATCH proxmox v2 01/25] wireguard: skip serializing preshared_key if unset Stefan Hanreich
2026-04-02 8:11 ` Stefan Hanreich [this message]
2026-04-02 8:11 ` [PATCH proxmox-ve-rs v2 03/25] sdn-types: add wireguard-specific PersistentKeepalive api type Stefan Hanreich
2026-04-02 8:11 ` [PATCH proxmox-ve-rs v2 04/25] ve-config: fabrics: split interface name regex into two parts Stefan Hanreich
2026-04-02 8:11 ` [PATCH proxmox-ve-rs v2 05/25] ve-config: fabric: refactor fabric config entry impl using macro Stefan Hanreich
2026-04-02 8:11 ` [PATCH proxmox-ve-rs v2 06/25] ve-config: fabrics: add protocol-specific properties for wireguard Stefan Hanreich
2026-04-02 8:11 ` [PATCH proxmox-ve-rs v2 07/25] ve-config: sdn: fabrics: add wireguard to the fabric config Stefan Hanreich
2026-04-02 8:11 ` [PATCH proxmox-ve-rs v2 08/25] ve-config: fabrics: wireguard add validation for wireguard config Stefan Hanreich
2026-04-02 8:11 ` [PATCH proxmox-ve-rs v2 09/25] ve-config: fabrics: implement wireguard config generation Stefan Hanreich
2026-04-02 8:11 ` [PATCH proxmox-perl-rs v2 10/25] pve-rs: fabrics: wireguard: generate ifupdown2 configuration Stefan Hanreich
2026-04-02 8:11 ` [PATCH proxmox-perl-rs v2 11/25] pve-rs: fabrics: add helpers for parsing interface property strings Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-network v2 12/25] sdn: add wireguard helper module Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-network v2 13/25] fabrics: wireguard: add schema definitions for wireguard Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-network v2 14/25] fabrics: wireguard: implement wireguard key auto-generation Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-manager v2 15/25] network: sdn: generate wireguard configuration on apply Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-manager v2 16/25] ui: fix parsing of property-strings when values contain = Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-manager v2 17/25] ui: fabrics: i18n: make node loading string translatable Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-manager v2 18/25] ui: fabrics: split node selector creation and config Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-manager v2 19/25] ui: fabrics: edit: make ipv4/6 support generic over fabric panels Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-manager v2 20/25] ui: fabrics: node: make ipv4/6 support generic over edit panels Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-manager v2 21/25] ui: fabrics: interface: " Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-manager v2 22/25] ui: fabrics: wireguard: add interface edit panel Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-manager v2 23/25] ui: fabrics: wireguard: add node " Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-manager v2 24/25] ui: fabrics: wireguard: add fabric " Stefan Hanreich
2026-04-02 8:11 ` [PATCH pve-manager v2 25/25] ui: fabrics: hook up wireguard components Stefan Hanreich
2026-04-02 13:58 ` [RFC manager/network/proxmox{,-ve-rs,-perl-rs} v2 00/25] Add WireGuard as protocol to SDN fabrics Gabriel Goller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260402081148.76276-3-s.hanreich@proxmox.com \
--to=s.hanreich@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox