[PATCH proxmox-ve-rs 2/9] frr: implement routemap match/set statements via adjacent tagging

[Stefan Hanreich <s.hanreich@proxmox.com>]

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/src/ser/route_map.rs | 101 +++++++++++++++++++------------
 2 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/proxmox-frr/Cargo.toml b/proxmox-frr/Cargo.toml
index 37a112e..1dbbb84 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/src/ser/route_map.rs b/proxmox-frr/src/ser/route_map.rs
index d12ae05..22807f1 100644
--- a/proxmox-frr/src/ser/route_map.rs
+++ b/proxmox-frr/src/ser/route_map.rs
@@ -1,6 +1,11 @@
+use core::net::{Ipv4Addr, Ipv6Addr};
 use std::net::IpAddr;
 
 use proxmox_network_types::ip_address::Cidr;
+use proxmox_sdn_types::{
+    bgp::{EvpnRouteType, SetMetricValue, SetTagValue},
+    IntegerWithSign, Vni,
+};
 use serde::{Deserialize, Serialize};
 
 /// The action for a [`AccessListRule`].
@@ -45,6 +50,12 @@ impl AccessListName {
     }
 }
 
+impl PrefixListName {
+    pub fn new(name: String) -> PrefixListName {
+        PrefixListName(name)
+    }
+}
+
 /// A FRR access-list.
 ///
 /// Holds a vec of rules. Each rule will get its own line, FRR will collect all the rules with the
@@ -83,42 +94,36 @@ pub struct VniMatch {
 /// 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),
-    #[serde(rename = "vni")]
-    Vni(u32),
-}
-
-#[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),
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum SetIpNextHopValue {
-    PeerAddress,
-    Unchanged,
-    IpAddr(IpAddr),
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
-pub enum SetTagValue {
-    Untagged,
-    Numeric(u32),
+    #[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.
@@ -126,12 +131,30 @@ pub enum SetTagValue {
 /// 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(IntegerWithSign),
+    #[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),
-    Community(String),
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
-- 
2.47.3