public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox-ve-rs 5/9] ve-config: ospf: generate redistribute config
Date: Mon,  4 May 2026 18:31:50 +0200	[thread overview]
Message-ID: <20260504163157.429628-6-s.hanreich@proxmox.com> (raw)
In-Reply-To: <20260504163157.429628-1-s.hanreich@proxmox.com>

Implements conversion from the section config types to the proxmox-frr
types and use the conversion trait to generate the required FRR
configuration for distributing routes.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
 proxmox-ve-config/src/sdn/fabric/frr.rs       | 14 ++++++--
 .../fabric/section_config/protocol/ospf.rs    | 32 +++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/proxmox-ve-config/src/sdn/fabric/frr.rs b/proxmox-ve-config/src/sdn/fabric/frr.rs
index fd99c3c..40e346f 100644
--- a/proxmox-ve-config/src/sdn/fabric/frr.rs
+++ b/proxmox-ve-config/src/sdn/fabric/frr.rs
@@ -3,7 +3,7 @@ use std::net::{IpAddr, Ipv4Addr};
 use tracing;
 
 use proxmox_frr::ser::openfabric::{OpenfabricInterface, OpenfabricRouter, OpenfabricRouterName};
-use proxmox_frr::ser::ospf::{self, OspfInterface, OspfRouter};
+use proxmox_frr::ser::ospf::{self, OspfInterface, OspfRedistribution, OspfRouter};
 use proxmox_frr::ser::route_map::{AccessListName, RouteMapEntry, RouteMapMatch, RouteMapSet};
 use proxmox_frr::ser::{self, FrrConfig, FrrProtocol, FrrWord, Interface, InterfaceName};
 use proxmox_network_types::ip_address::Cidr;
@@ -202,7 +202,17 @@ pub fn build_fabric(
                 let frr_area = ser::ospf::Area::new(frr_word_area)?;
 
                 if frr_config.ospf.router.is_none() {
-                    frr_config.ospf.router = Some(build_ospf_router(*router_id)?);
+                    let mut ospf_router = build_ospf_router(*router_id)?;
+
+                    ospf_router.redistribute = fabric
+                        .properties()
+                        .redistributions()
+                        .into_iter()
+                        .cloned()
+                        .map(OspfRedistribution::from)
+                        .collect();
+
+                    frr_config.ospf.router = Some(ospf_router);
                 }
 
                 // Add dummy interface
diff --git a/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs b/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs
index 8f0b57c..2a6ba6b 100644
--- a/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs
+++ b/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs
@@ -49,6 +49,38 @@ pub struct OspfRedistribution {
     pub(crate) route_map: Option<String>,
 }
 
+#[cfg(feature = "frr")]
+mod frr {
+    use proxmox_frr::ser::ospf::OspfRedistribution as FrrOspfRedistribution;
+    use proxmox_frr::ser::ospf::OspfRedistributionSource as FrrOspfRedistributionSource;
+
+    use super::*;
+
+    impl From<OspfRedistribution> for FrrOspfRedistribution {
+        fn from(value: OspfRedistribution) -> Self {
+            Self {
+                source: value.source.into(),
+                metric: value.metric,
+                route_map: value.route_map.into(),
+            }
+        }
+    }
+
+    impl From<OspfRedistributionSource> for FrrOspfRedistributionSource {
+        fn from(value: OspfRedistributionSource) -> Self {
+            match value {
+                OspfRedistributionSource::Bgp => FrrOspfRedistributionSource::Bgp,
+                OspfRedistributionSource::Connected => FrrOspfRedistributionSource::Connected,
+                OspfRedistributionSource::Isis => FrrOspfRedistributionSource::Isis,
+                OspfRedistributionSource::Kernel => FrrOspfRedistributionSource::Kernel,
+                OspfRedistributionSource::Openfabric => FrrOspfRedistributionSource::Openfabric,
+                OspfRedistributionSource::Ospf => FrrOspfRedistributionSource::Ospf,
+                OspfRedistributionSource::Static => FrrOspfRedistributionSource::Static,
+            }
+        }
+    }
+}
+
 #[api(
     properties: {
         redistribute: {
-- 
2.47.3





  parent reply	other threads:[~2026-05-04 16:33 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-04 16:31 [PATCH manager/network/proxmox-ve-rs 0/9] Implement route redistribution for OSPF Stefan Hanreich
2026-05-04 16:31 ` [PATCH proxmox-ve-rs 1/9] frr: ospf: add redistribute setting Stefan Hanreich
2026-05-04 16:31 ` [PATCH proxmox-ve-rs 2/9] frr-templates: render " Stefan Hanreich
2026-05-04 16:31 ` [PATCH proxmox-ve-rs 3/9] ve-config: add redistribute setting to ospf section config Stefan Hanreich
2026-05-04 16:31 ` [PATCH proxmox-ve-rs 4/9] ve-config: use constructor instead of instantiating struct Stefan Hanreich
2026-05-04 16:31 ` Stefan Hanreich [this message]
2026-05-04 16:31 ` [PATCH pve-network 6/9] fabrics: ospf: add redistribute to api types Stefan Hanreich
2026-05-04 16:31 ` [PATCH pve-manager 7/9] ui: sdn: fabrics: add redistribution grid component Stefan Hanreich
2026-05-04 16:31 ` [PATCH pve-manager 8/9] ui: sdn: fabric edit: allow defining multiple tabs Stefan Hanreich
2026-05-04 16:31 ` [PATCH pve-manager 9/9] ui: sdn: ospf fabric: add redistribution grid to ospf fabric 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=20260504163157.429628-6-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal