In order to also display the neighbors of a specific node in the
FabricContentView resource window get the Neighbors of the all the
fabrics. Query frr (vtysh) to get the neighbors of both openefabric and
ospf, parse it and then compile a array containing all neighbors and
the fabric it relates to.
Signed-off-by: Gabriel Goller <g.gol...@proxmox.com>
---
pve-rs/src/bindings/sdn/fabrics.rs | 43 ++++++++++++
pve-rs/src/sdn/status.rs | 107 +++++++++++++++++++++++++++++
2 files changed, 150 insertions(+)
diff --git a/pve-rs/src/bindings/sdn/fabrics.rs
b/pve-rs/src/bindings/sdn/fabrics.rs
index 14dad216dbf4..079a58c27d32 100644
--- a/pve-rs/src/bindings/sdn/fabrics.rs
+++ b/pve-rs/src/bindings/sdn/fabrics.rs
@@ -640,6 +640,49 @@ pub mod pve_rs_sdn_fabrics {
status::get_routes(route_status)
}
+ /// Get all the neighbors of all the fabrics on this node.
+ ///
+ /// Go through all fabrics that exist on this node. Then get the neighbors
of them all and
+ /// concat them into a single array.
+ #[export]
+ fn neighbors() -> Result<Vec<status::NeighborStatus>, Error> {
+ let openfabric_neighbors_string = String::from_utf8(
+ Command::new("sh")
+ .args(["-c", "vtysh -c 'show openfabric neighbor json'"])
+ .output()?
+ .stdout,
+ )?;
+
+ let ospf_neighbors_string = String::from_utf8(
+ Command::new("sh")
+ .args(["-c", "vtysh -c 'show ip ospf neighbor json'"])
+ .output()?
+ .stdout,
+ )?;
+
+ let openfabric_neighbors: proxmox_frr::de::openfabric::Neighbors =
+ if openfabric_neighbors_string.is_empty() {
+ proxmox_frr::de::openfabric::Neighbors::default()
+ } else {
+ serde_json::from_str(&openfabric_neighbors_string)
+ .with_context(|| "error parsing openfabric neighbors")?
+ };
+
+ let ospf_neighbors: proxmox_frr::de::ospf::Neighbors = if
ospf_neighbors_string.is_empty() {
+ proxmox_frr::de::ospf::Neighbors::default()
+ } else {
+ serde_json::from_str(&ospf_neighbors_string)
+ .with_context(|| "error parsing ospf neighbors")?
+ };
+
+ let neighbor_status = status::NeighborsParsed {
+ openfabric: openfabric_neighbors,
+ ospf: ospf_neighbors,
+ };
+
+ status::get_neighbors(neighbor_status)
+ }
+
/// Return the status of all fabrics on this node.
///
/// Go through all fabrics in the config, then filter out the ones that
exist on this node.
diff --git a/pve-rs/src/sdn/status.rs b/pve-rs/src/sdn/status.rs
index c5cac016fbf0..fc8c19bbcf53 100644
--- a/pve-rs/src/sdn/status.rs
+++ b/pve-rs/src/sdn/status.rs
@@ -10,6 +10,18 @@ use proxmox_ve_config::sdn::fabric::{
section_config::{Section, fabric::FabricId, node::Node as ConfigNode},
};
+/// The status of a neighbor.
+///
+/// Contains the neighbor, the fabric and protocol it belongs to and the some
status
+/// information.
+#[derive(Debug, Serialize)]
+pub struct NeighborStatus {
+ neighbor: String,
+ status: String,
+ fabric_id: FabricId,
+ protocol: Protocol,
+}
+
/// The status of a route.
///
/// Contains the route, the fabric and protocol it belongs to and some extra
nexthop
@@ -68,6 +80,19 @@ pub struct RoutesParsed {
pub ospf: de::Routes,
}
+/// Parsed neighbors for all protocols
+///
+/// These are the neighbors parsed from the json output of:
+/// `vtysh -c 'show openfabric neighbor json'` and
+/// `vtysh -c 'show ip ospf neighbor json'`.
+#[derive(Debug, Serialize)]
+pub struct NeighborsParsed {
+ /// The openfabric neighbors in FRR
+ pub openfabric: de::openfabric::Neighbors,
+ /// The ospf neighbors in FRR
+ pub ospf: de::ospf::Neighbors,
+}
+
/// Config used to parse the fabric part of the running-config
#[derive(Deserialize)]
struct RunningConfig {
@@ -160,6 +185,88 @@ pub fn get_routes(routes: RoutesParsed) ->
Result<Vec<RouteStatus>, anyhow::Erro
Ok(stats)
}
+/// Get a list of all neighbors of all the fabrics configured
+///
+/// Convert the passed neighbors of all frr protocols to a list of neighbors
with
+/// with properties associating them to a specific fabric.
+pub fn get_neighbors(neighbors: NeighborsParsed) ->
Result<Vec<NeighborStatus>, anyhow::Error> {
+ let hostname = proxmox_sys::nodename();
+
+ // get all nodes
+ let raw_config = std::fs::read_to_string("/etc/pve/sdn/.running-config")?;
+ let running_config: RunningConfig =
+ serde_json::from_str(&raw_config).with_context(|| "error parsing
running-config")?;
+ let section_config =
SectionConfigData::from_iter(running_config.fabrics.ids);
+ let config = FabricConfig::from_section_config(section_config)
+ .with_context(|| "error converting section config to fabricconfig")?;
+
+ let mut stats: Vec<NeighborStatus> = Vec::new();
+
+ for (nodeid, node) in config.all_nodes() {
+ if nodeid.as_str() != hostname {
+ continue;
+ }
+ let fabric_id = node.id().fabric_id();
+
+ match node {
+ ConfigNode::Openfabric(_) => {
+ for area in &neighbors.openfabric.areas {
+ if area.area == fabric_id.as_str() {
+ for circuit in &area.circuits {
+ if let (Some(adj), Some(state)) = (&circuit.adj,
&circuit.state) {
+ stats.push(NeighborStatus {
+ neighbor: adj.clone(),
+ status: state.clone(),
+ protocol: Protocol::Openfabric,
+ fabric_id: fabric_id.clone(),
+ });
+ }
+ }
+ }
+ }
+ }
+ ConfigNode::Ospf(node) => {
+ let interface_names: HashSet<&str> = node
+ .properties()
+ .interfaces()
+ .map(|i| i.name().as_str())
+ .collect();
+
+ for (neighbor_key, neighbor_list) in &neighbors.ospf.neighbors
{
+ let mut has_matching_neighbor = false;
+ for neighbor in neighbor_list {
+ match neighbor.interface_name.split_once(":") {
+ Some((interface_name, _)) => {
+ if interface_names.contains(interface_name) {
+ has_matching_neighbor = true;
+ break;
+ }
+ }
+ _ => {
+ continue;
+ }
+ }
+ }
+ if has_matching_neighbor {
+ let status = neighbor_list
+ .first()
+ .map(|n| n.neighbor_state.clone())
+ .unwrap_or_default();
+ stats.push(NeighborStatus {
+ neighbor: neighbor_key.clone(),
+ status,
+ protocol: Protocol::Ospf,
+ fabric_id: fabric_id.clone(),
+ });
+ }
+ }
+ }
+ }
+ }
+
+ Ok(stats)
+}
+
/// Get the status for each fabric using the parsed routes from frr
///
/// Using the parsed routes we get from frr, filter and map them to a HashMap
mapping every
--
2.47.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
