From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH proxmox-api-types v4 1/6] sdn: add list/create zone endpoints
Date: Wed, 3 Sep 2025 18:35:58 +0200 [thread overview]
Message-ID: <20250903163621.530823-11-s.hanreich@proxmox.com> (raw)
In-Reply-To: <20250903163621.530823-1-s.hanreich@proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
pve-api-types/generate.pl | 18 +++++++++
pve-api-types/src/types/verifiers.rs | 56 ++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/pve-api-types/generate.pl b/pve-api-types/generate.pl
index cd08f3d..dc45d98 100644
--- a/pve-api-types/generate.pl
+++ b/pve-api-types/generate.pl
@@ -79,6 +79,8 @@ Schema2Rust::register_format('bridge-pair' => { code => 'verifiers::verify_bridg
Schema2Rust::register_format('pve-task-status-type' => { regex => '^(?i:ok|error|warning|unknown)$' });
+Schema2Rust::register_format('pve-sdn-zone-id' => { code => 'verifiers::verify_sdn_id' });
+
Schema2Rust::register_enum_variant('PveVmCpuConfReportedModel::486' => 'I486');
Schema2Rust::register_enum_variant('QemuConfigEfidisk0Efitype::2m' => 'Mb2');
Schema2Rust::register_enum_variant('QemuConfigEfidisk0Efitype::4m' => 'Mb4');
@@ -104,6 +106,10 @@ Schema2Rust::register_format('pve-iface' => { regex => '^[a-zA-Z][a-zA-Z0-9_]{1,
Schema2Rust::register_format('pve-vlan-id-or-range' => { code => 'verifiers::verify_vlan_id_or_range' });
+Schema2Rust::register_format('pve-sdn-bgp-rt' => { code => 'verifiers::verify_sdn_bgp_rt' });
+Schema2Rust::register_format('pve-sdn-controller-id' => { code => 'verifiers::verify_sdn_controller_id' });
+Schema2Rust::register_format('pve-sdn-isis-net' => { regex => '^[a-fA-F0-9]{2}(\.[a-fA-F0-9]{4}){3,9}\.[a-fA-F0-9]{2}$' });
+
# This is used as both a task status and guest status.
Schema2Rust::generate_enum('IsRunning', {
type => 'string',
@@ -328,6 +334,18 @@ api(GET => '/nodes/{node}/apt/update', 'list_available_updates', 'return-name' =
api(POST => '/nodes/{node}/apt/update', 'update_apt_database', 'output-type' => 'PveUpid', 'param-name' => 'AptUpdateParams');
api(GET => '/nodes/{node}/apt/changelog', 'get_package_changelog', 'output-type' => 'String');
+Schema2Rust::generate_enum('SdnObjectState', {
+ type => 'string',
+ description => "The state of an SDN object.",
+ enum => ['new', 'deleted', 'changed'],
+});
+
+api(GET => '/cluster/sdn/zones', 'list_zones', 'return-name' => 'SdnZone');
+Schema2Rust::derive('SdnZone' => 'Clone', 'PartialEq');
+Schema2Rust::derive('SdnZonePending' => 'Clone', 'PartialEq');
+api(POST => '/cluster/sdn/zones', 'create_zone', 'param-name' => 'CreateZone');
+Schema2Rust::derive('CreateZone' => 'Clone', 'PartialEq');
+
# NOW DUMP THE CODE:
#
# We generate one file for API types, and one for API method calls.
diff --git a/pve-api-types/src/types/verifiers.rs b/pve-api-types/src/types/verifiers.rs
index e0ad4ca..9a88118 100644
--- a/pve-api-types/src/types/verifiers.rs
+++ b/pve-api-types/src/types/verifiers.rs
@@ -29,6 +29,12 @@ pub IFACE_RE = r##"^(?i)[a-z][a-z0-9_]{1,20}([:\.]\d+)?$"##;
pub VLAN_ID_OR_RANGE = r##"^(\d+)(?:-(\d+))?$"##;
+pub SDN_ID = r##"^(?i)[a-z][a-z0-9]+$"##;
+
+pub SDN_CONTROLLER_ID = r##"^(?i)[a-z][a-z0-9_-]*[a-z0-9]$"##;
+
+pub SDN_BGP_RT = r##"^(\d+):(\d+)$"##;
+
}
pub fn verify_volume_id(s: &str) -> Result<(), Error> {
@@ -228,3 +234,53 @@ pub fn verify_vlan_id_or_range(s: &str) -> Result<(), Error> {
Ok(())
}
+
+pub fn verify_sdn_id(s: &str) -> Result<(), Error> {
+ if s.len() > 8 {
+ bail!("SDN ID cannot be longer than 8 characters")
+ }
+
+ if !SDN_ID.is_match(s) {
+ bail!("SDN ID contains illegal characters");
+ }
+
+ Ok(())
+}
+
+pub fn verify_sdn_controller_id(s: &str) -> Result<(), Error> {
+ if s.len() > 64 {
+ bail!("SDN controller ID cannot be longer than 64 characters")
+ }
+
+ if !SDN_CONTROLLER_ID.is_match(s) {
+ bail!("SDN controller ID contains illegal characters");
+ }
+
+ Ok(())
+}
+
+pub fn verify_sdn_bgp_rt(s: &str) -> Result<(), Error> {
+ let captures = SDN_BGP_RT
+ .captures(s)
+ .ok_or_else(|| format_err!("invalid BGP RT: '{s}"))?;
+
+ match (captures.get(1), captures.get(2)) {
+ (Some(asn), Some(vni)) => {
+ asn.as_str()
+ .parse::<u32>()
+ .map_err(|_| format_err!("Invalid ASN in BGP RT: {s}"))?;
+
+ let vni: u32 = vni
+ .as_str()
+ .parse()
+ .map_err(|_| format_err!("Invalid VNI in BGP RT: {s}"))?;
+
+ if vni > 16_777_215 {
+ bail!("invalid VNI in BGP RT: '{s}'")
+ }
+ }
+ _ => bail!("invalid BGP RT: '{s}"),
+ }
+
+ Ok(())
+}
--
2.47.2
_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel
next prev parent reply other threads:[~2025-09-03 16:36 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-03 16:35 [pdm-devel] [PATCH network/proxmox{, -backup, -api-types, -datacenter-manager} v4 00/30] Add initial SDN / EVPN integration Stefan Hanreich
2025-09-03 16:35 ` [pdm-devel] [PATCH proxmox v4 1/2] schema: use i64 for minimum / maximum / default integer values Stefan Hanreich
2025-09-03 16:35 ` [pdm-devel] [PATCH proxmox v4 2/2] pbs-api-types: fix values for integer schemas Stefan Hanreich
2025-09-03 16:35 ` [pdm-devel] [PATCH proxmox-backup v4 1/1] api: change integer schema parameters to i64 Stefan Hanreich
2025-09-03 16:35 ` [pdm-devel] [PATCH pve-network v4 1/6] sdn: api: return null for rollback / lock endpoints Stefan Hanreich
2025-09-03 16:35 ` [pdm-devel] [PATCH pve-network v4 2/6] controllers: fix maximum value for ASN Stefan Hanreich
2025-09-03 16:35 ` [pdm-devel] [PATCH pve-network v4 3/6] api: add state standard option Stefan Hanreich
2025-09-03 16:35 ` [pdm-devel] [PATCH pve-network v4 4/6] api: controllers: update schema of endpoints Stefan Hanreich
2025-09-03 16:35 ` [pdm-devel] [PATCH pve-network v4 5/6] api: vnets: " Stefan Hanreich
2025-09-03 16:35 ` [pdm-devel] [PATCH pve-network v4 6/6] api: zones: " Stefan Hanreich
2025-09-03 16:35 ` Stefan Hanreich [this message]
2025-09-03 16:35 ` [pdm-devel] [PATCH proxmox-api-types v4 2/6] sdn: add list/create vnet endpoints Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-api-types v4 3/6] sdn: add list/create controller endpoints Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-api-types v4 4/6] sdn: add sdn configuration locking endpoints Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-api-types v4 5/6] tasks: add helper for querying successfully finished tasks Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-api-types v4 6/6] sdn: add helpers for pending values Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 01/15] server: add locked sdn client helpers Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 02/15] ui: pve: sdn: add descriptions for sdn tasks Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 03/15] api: sdn: add list_zones endpoint Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 04/15] api: sdn: add create_zone endpoint Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 05/15] api: sdn: add list_vnets endpoint Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 06/15] api: sdn: add create_vnet endpoint Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 07/15] api: sdn: add list_controllers endpoint Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 08/15] ui: sdn: add EvpnRouteTarget type Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 09/15] ui: sdn: add vnet icon Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 10/15] ui: sdn: add view for showing evpn zones Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 11/15] ui: sdn: add view for showing ip vrfs Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 12/15] ui: sdn: add component for creating evpn vnets Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 13/15] ui: sdn: add component for creatin evpn zones Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 14/15] ui: sdn: add evpn overview panel Stefan Hanreich
2025-09-03 16:36 ` [pdm-devel] [PATCH proxmox-datacenter-manager v4 15/15] ui: sdn: add evpn panel to main menu Stefan Hanreich
2025-09-04 7:54 ` [pdm-devel] [PATCH network/proxmox{, -backup, -api-types, -datacenter-manager} v4 00/30] Add initial SDN / EVPN integration Dominik Csapak
2025-09-04 8:18 ` Stefan Hanreich
2025-09-04 8:22 ` Stefan Hanreich
2025-09-04 8:37 ` [pdm-devel] superseded: " Stefan Hanreich
2025-09-04 8:18 [pdm-devel] " Stefan Hanreich
2025-09-04 8:18 ` [pdm-devel] [PATCH proxmox-api-types v4 1/6] sdn: add list/create zone endpoints Stefan Hanreich
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=20250903163621.530823-11-s.hanreich@proxmox.com \
--to=s.hanreich@proxmox.com \
--cc=pdm-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