[PATCH proxmox-ve-rs v5 07/46] frr: implement routemap match/set statements via adjacent tagging

Stefan Hanreich
2026-05-05T15:40:35Z

Previously, the types used a mix of adjacent / internal tagging and a
nesting of types to represent match and set statements. This has been
simplified by utilizing adjacent tagging on the set / match statements
and using the exact FRR configuration key as the tag. This way a
single enum can be used to represent match / set statements and all
variants can be rendered the same by simply printing the keys /
values.

This commit also adds a lot of new match / set statements that were
previously not supported. The crate supports now almost all match /
set statements that FRR supports - with only a few having been
omitted. Most notably it is not possible to match on community lists,
support for those is planned in a future patch series.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
proxmox-frr/Cargo.toml | 2 +-
proxmox-frr/debian/control | 2 +
proxmox-frr/src/ser/route_map.rs | 81 ++++++++++++++++++++++----------
3 files changed, 60 insertions(+), 25 deletions(-)

diff --git a/proxmox-frr/Cargo.toml b/proxmox-frr/Cargo.toml
index bfebfda..aa79909 100644
--- a/proxmox-frr/Cargo.toml
+++ b/proxmox-frr/Cargo.toml
@@ -17,7 +17,7 @@ serde = { workspace = true, features = [ "derive" ] }
serde_repr = "0.1"
minijinja = { version = "2.5", features = [ "multi_template", "loader" ] }

-proxmox-network-types = { workspace = true }
+proxmox-network-types = { workspace = true, features = ["api-types"] }
proxmox-sdn-types = { workspace = true }
proxmox-serde = { workspace = true }
proxmox-sortable-macro = "1"
diff --git a/proxmox-frr/debian/control b/proxmox-frr/debian/control
index e918000..ac5d977 100644
--- a/proxmox-frr/debian/control
+++ b/proxmox-frr/debian/control
@@ -10,6 +10,7 @@ Build-Depends-Arch: cargo:native <!nocheck>,
librust-minijinja-2+default-dev (>= 2.5-~~) <!nocheck>,
librust-minijinja-2+loader-dev (>= 2.5-~~) <!nocheck>,
librust-minijinja-2+multi-template-dev (>= 2.5-~~) <!nocheck>,
+ librust-proxmox-network-types-1+api-types-dev (>= 1.0.1-~~) <!nocheck>,
librust-proxmox-network-types-1+default-dev (>= 1.0.1-~~) <!nocheck>,
librust-proxmox-sdn-types-0.2+default-dev <!nocheck>,
librust-proxmox-serde-1+default-dev <!nocheck>,
@@ -36,6 +37,7 @@ Depends:
librust-minijinja-2+default-dev (>= 2.5-~~),
librust-minijinja-2+loader-dev (>= 2.5-~~),
librust-minijinja-2+multi-template-dev (>= 2.5-~~),
+ librust-proxmox-network-types-1+api-types-dev (>= 1.0.1-~~),
librust-proxmox-network-types-1+default-dev (>= 1.0.1-~~),
librust-proxmox-sdn-types-0.2+default-dev,
librust-proxmox-serde-1+default-dev,
diff --git a/proxmox-frr/src/ser/route_map.rs b/proxmox-frr/src/ser/route_map.rs
index 636dde2..bceff18 100644
--- a/proxmox-frr/src/ser/route_map.rs
+++ b/proxmox-frr/src/ser/route_map.rs
@@ -1,6 +1,10 @@
-use std::net::IpAddr;
+use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};

use proxmox_network_types::ip_address::Cidr;
+use proxmox_sdn_types::{
+ bgp::{EvpnRouteType, SetMetricValue, SetTagValue},
+ ModifyNumber, Vni,
+};
use serde::{Deserialize, Serialize};

/// The action for a [`AccessListRule`].
@@ -68,27 +72,36 @@ pub struct PrefixListRule {
/// execute its actions. If we match on an IP, there are two different syntaxes: `match ip ...` or
/// `match ipv6 ...`.
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(tag = "protocol_type")]
+#[serde(tag = "key", content = "value")]
pub enum RouteMapMatch {
- #[serde(rename = "ip")]
- V4(RouteMapMatchInner),
- #[serde(rename = "ipv6")]
- V6(RouteMapMatchInner),
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(tag = "list_type", content = "list_name", rename_all = "lowercase")]
-pub enum AccessListOrPrefixList {
- PrefixList(PrefixListName),
- AccessList(AccessListName),
-}
-
-/// A route-map match statement generic on the IP-version.
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(tag = "match_type", content = "value", rename_all = "kebab-case")]
-pub enum RouteMapMatchInner {
- Address(AccessListOrPrefixList),
- NextHop(String),
+ #[serde(rename = "evpn route-type")]
+ RouteType(EvpnRouteType),
+ #[serde(rename = "evpn vni")]
+ Vni(Vni),
+ #[serde(rename = "ip address")]
+ IpAddressAccessList(AccessListName),
+ #[serde(rename = "ipv6 address")]
+ Ip6AddressAccessList(AccessListName),
+ #[serde(rename = "ip address prefix-list")]
+ IpAddressPrefixList(PrefixListName),
+ #[serde(rename = "ipv6 address prefix-list")]
+ Ip6AddressPrefixList(PrefixListName),
+ #[serde(rename = "ip next-hop prefix-list")]
+ IpNextHopPrefixList(PrefixListName),
+ #[serde(rename = "ipv6 next-hop prefix-list")]
+ Ip6NextHopPrefixList(PrefixListName),
+ #[serde(rename = "ip next-hop address")]
+ IpNextHopAddress(Ipv4Addr),
+ #[serde(rename = "ipv6 next-hop address")]
+ Ip6NextHopAddress(Ipv6Addr),
+ #[serde(rename = "metric")]
+ Metric(#[serde(deserialize_with = "proxmox_serde::perl::deserialize_u32")] u32),
+ #[serde(rename = "local-preference")]
+ LocalPreference(#[serde(deserialize_with = "proxmox_serde::perl::deserialize_u32")] u32),
+ #[serde(rename = "peer")]
+ Peer(String),
+ #[serde(rename = "tag")]
+ Tag(SetTagValue),
}

/// Defines the Action a route-map takes when it matches on a route.
@@ -96,11 +109,31 @@ pub enum RouteMapMatchInner {
/// If the route matches the [`RouteMapMatch`], then a [`RouteMapSet`] action will be executed.
/// We currently only use the IpSrc command which changes the source address of the route.
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(tag = "set_type", content = "value", rename_all = "kebab-case")]
+#[serde(tag = "key", content = "value")]
pub enum RouteMapSet {
- LocalPreference(u32),
+ #[serde(rename = "ip next-hop peer-address")]
+ IpNextHopPeerAddress,
+ #[serde(rename = "ip next-hop unchanged")]
+ IpNextHopUnchanged,
+ #[serde(rename = "ip next-hop")]
+ IpNextHop(Ipv4Addr),
+ #[serde(rename = "ipv6 next-hop peer-address")]
+ Ip6NextHopPeerAddress,
+ #[serde(rename = "ipv6 next-hop prefer-global")]
+ Ip6NextHopPreferGlobal,
+ #[serde(rename = "ipv6 next-hop global")]
+ Ip6NextHop(Ipv6Addr),
+ #[serde(rename = "local-preference")]
+ LocalPreference(ModifyNumber),
+ #[serde(rename = "tag")]
+ Tag(SetTagValue),
+ #[serde(rename = "weight")]
+ Weight(#[serde(deserialize_with = "proxmox_serde::perl::deserialize_u32")] u32),
+ #[serde(rename = "metric")]
+ Metric(SetMetricValue),
+ #[serde(rename = "src")]
Src(IpAddr),
- Metric(u32),
+ #[serde(rename = "community")]
Community(String),
}

--
2.47.3