[PATCH proxmox-ve-rs 9/9] ve-config: fabrics: adapt frr config generation to new format

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

The format for representing match statements in route maps has
changed, adapt the FRR config generation for fabrics to use the new
format.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
 proxmox-ve-config/src/sdn/fabric/frr.rs | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/proxmox-ve-config/src/sdn/fabric/frr.rs b/proxmox-ve-config/src/sdn/fabric/frr.rs
index f2b7c72..dbb5924 100644
--- a/proxmox-ve-config/src/sdn/fabric/frr.rs
+++ b/proxmox-ve-config/src/sdn/fabric/frr.rs
@@ -5,8 +5,7 @@ use tracing;
 use proxmox_frr::ser::openfabric::{OpenfabricInterface, OpenfabricRouter, OpenfabricRouterName};
 use proxmox_frr::ser::ospf::{self, OspfInterface, OspfRouter};
 use proxmox_frr::ser::route_map::{
-    AccessAction, AccessListName, AccessListOrPrefixList, RouteMapEntry, RouteMapMatch,
-    RouteMapMatchInner, RouteMapName, RouteMapSet,
+    AccessAction, AccessListName, RouteMapEntry, RouteMapMatch, RouteMapName, RouteMapSet,
 };
 use proxmox_frr::ser::{
     self, FrrConfig, FrrProtocol, FrrWord, Interface, InterfaceName, IpProtocolRouteMap,
@@ -402,16 +401,12 @@ fn build_openfabric_routemap(
             seq,
             action: ser::route_map::AccessAction::Permit,
             matches: vec![match router_ip {
-                IpAddr::V4(_) => RouteMapMatch::V4(RouteMapMatchInner::Address(
-                    AccessListOrPrefixList::AccessList(AccessListName::new(format!(
-                        "pve_openfabric_{fabric_id}_ips"
-                    ))),
-                )),
-                IpAddr::V6(_) => RouteMapMatch::V6(RouteMapMatchInner::Address(
-                    AccessListOrPrefixList::AccessList(AccessListName::new(format!(
-                        "pve_openfabric_{fabric_id}_ip6s"
-                    ))),
-                )),
+                IpAddr::V4(_) => RouteMapMatch::IpAddressAccessList(AccessListName::new(format!(
+                    "pve_openfabric_{fabric_id}_ips"
+                ))),
+                IpAddr::V6(_) => RouteMapMatch::Ip6AddressAccessList(AccessListName::new(format!(
+                    "pve_openfabric_{fabric_id}_ip6s"
+                ))),
             }],
             sets: vec![RouteMapSet::Src(router_ip)],
             custom_frr_config: Vec::new(),
@@ -430,10 +425,8 @@ fn build_ospf_dummy_routemap(
     let routemap = RouteMapEntry {
         seq,
         action: AccessAction::Permit,
-        matches: vec![RouteMapMatch::V4(RouteMapMatchInner::Address(
-            AccessListOrPrefixList::AccessList(AccessListName::new(format!(
-                "pve_ospf_{fabric_id}_ips"
-            ))),
+        matches: vec![RouteMapMatch::IpAddressAccessList(AccessListName::new(
+            format!("pve_ospf_{fabric_id}_ips"),
         ))],
         sets: vec![RouteMapSet::Src(IpAddr::from(router_ip))],
         custom_frr_config: Vec::new(),
-- 
2.47.3