Generate the interfaces that have been configured with IS-IS to the ifupdown config (enable ip-forwarding on all). IS-IS needs to have the ip-address duplicated from the dummy interface to every interface in unnumbered mode (like with ospf). This could potentially be fixed in the future with [0].
[0]: https://github.com/FRRouting/frr/pull/19429 Signed-off-by: Gabriel Goller <g.gol...@proxmox.com> --- pve-rs/src/bindings/sdn/fabrics.rs | 57 +++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/pve-rs/src/bindings/sdn/fabrics.rs b/pve-rs/src/bindings/sdn/fabrics.rs index 587b1d68c8fb..d345112de4f3 100644 --- a/pve-rs/src/bindings/sdn/fabrics.rs +++ b/pve-rs/src/bindings/sdn/fabrics.rs @@ -348,7 +348,14 @@ pub mod pve_rs_sdn_fabrics { match node { ConfigNode::Openfabric(node_section) => { for interface in node_section.properties_mut().interfaces_mut() { - if let Some(mapped_name) = map_name(&mapping, &interface.name())? { + if let Some(mapped_name) = map_name(&mapping, interface.name())? { + interface.set_name(mapped_name); + } + } + } + ConfigNode::Isis(node_section) => { + for interface in node_section.properties_mut().interfaces_mut() { + if let Some(mapped_name) = map_name(&mapping, interface.name())? { interface.set_name(mapped_name); } } @@ -452,6 +459,9 @@ pub mod pve_rs_sdn_fabrics { FabricEntry::Openfabric(_) => { daemons.insert("fabricd"); } + FabricEntry::Isis(_) => { + daemons.insert("isisd"); + } }; } @@ -553,6 +563,51 @@ pub mod pve_rs_sdn_fabrics { } } } + ConfigNode::Isis(node_section) => { + for interface in node_section.properties().interfaces() { + if interface.ip().is_some() || interface.ip6().is_some() { + if let Some(ip) = interface.ip() { + let interface = + render_interface(interface.name(), Cidr::from(ip), false)?; + writeln!(interfaces)?; + write!(interfaces, "{interface}")?; + } + if let Some(ip) = interface.ip6() { + let interface = + render_interface(interface.name(), Cidr::from(ip), false)?; + writeln!(interfaces)?; + write!(interfaces, "{interface}")?; + } + } else { + let interface_string: String; + if let Some(ip) = node.ip() { + interface_string = render_interface( + interface.name(), + Cidr::from(IpAddr::from(ip)), + false, + )?; + } else if let Some(ip6) = node.ip6() { + interface_string = render_interface( + interface.name(), + Cidr::from(IpAddr::from(ip6)), + false, + )?; + } else { + return Err(anyhow::anyhow!("there has to be a ipv4 address")); + } + writeln!(interfaces)?; + write!(interfaces, "{interface_string}")?; + } + + // If not ip is configured, add auto and empty iface to bring interface up + if let (None, None) = (interface.ip(), interface.ip6()) { + writeln!(interfaces)?; + writeln!(interfaces, "auto {}", interface.name())?; + writeln!(interfaces, "iface {}", interface.name())?; + writeln!(interfaces, "\tip-forward 1")?; + } + } + } ConfigNode::Ospf(node_section) => { for interface in node_section.properties().interfaces() { if let Some(ip) = interface.ip() { -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
