isis: use unified map for interface addresses and redistributed routes

Eliminate code duplication by replacing separate IPv4/IPv6 maps with
a unified map.

Signed-off-by: Renato Westphal <[email protected]>

Author: rwestphal

holo-isis/src/ibus/rx.rs

@@ -16,7 +16,6 @@ use holo_utils::southbound::{
     AddressMsg, InterfaceUpdateMsg, RouteKeyMsg, RouteMsg,
 };
 use holo_utils::sr::SrCfg;
-use ipnetwork::IpNetwork;
 
 use crate::adjacency::{AdjacencyEvent, AdjacencyState};
 use crate::error::Error;
@@ -89,14 +88,7 @@ pub(crate) fn process_addr_add(instance: &mut Instance, msg: AddressMsg) {
     let iface_idx = iface.index;
 
     // Add address to interface.
-    match msg.addr {
-        IpNetwork::V4(addr) => {
-            iface.system.ipv4_addr_list.insert(addr);
-        }
-        IpNetwork::V6(addr) => {
-            iface.system.ipv6_addr_list.insert(addr);
-        }
-    }
+    iface.system.addr_list.insert(msg.addr);
 
     if let Some((mut instance, arenas)) = instance.as_up() {
         let iface = &mut arenas.interfaces[iface_idx];
@@ -122,14 +114,7 @@ pub(crate) fn process_addr_del(instance: &mut Instance, msg: AddressMsg) {
     let iface_idx = iface.index;
 
     // Remove address from interface.
-    match msg.addr {
-        IpNetwork::V4(addr) => {
-            iface.system.ipv4_addr_list.remove(&addr);
-        }
-        IpNetwork::V6(addr) => {
-            iface.system.ipv6_addr_list.remove(&addr);
-        }
-    }
+    iface.system.addr_list.remove(&msg.addr);
 
     if let Some((mut instance, arenas)) = instance.as_up() {
         let iface = &mut arenas.interfaces[iface_idx];
@@ -173,16 +158,8 @@ pub(crate) fn process_route_add(instance: &mut Instance, msg: RouteMsg) {
             tag: msg.tag,
             opaque_attrs: msg.opaque_attrs,
         };
-        match prefix {
-            IpNetwork::V4(prefix) => {
-                let routes = instance.system.ipv4_routes.get_mut(level);
-                routes.insert(prefix, route);
-            }
-            IpNetwork::V6(prefix) => {
-                let routes = instance.system.ipv6_routes.get_mut(level);
-                routes.insert(prefix, route);
-            }
-        }
+        let routes = instance.system.routes.get_mut(level);
+        routes.insert(prefix, route);
 
         // Schedule LSP reorigination.
         if let Some((mut instance, _)) = instance.as_up() {
@@ -212,16 +189,8 @@ pub(crate) fn process_route_del(instance: &mut Instance, msg: RouteKeyMsg) {
         })
         .collect::<Vec<_>>()
     {
-        match prefix {
-            IpNetwork::V4(prefix) => {
-                let routes = instance.system.ipv4_routes.get_mut(level);
-                routes.remove(&prefix);
-            }
-            IpNetwork::V6(prefix) => {
-                let routes = instance.system.ipv6_routes.get_mut(level);
-                routes.remove(&prefix);
-            }
-        }
+        let routes = instance.system.routes.get_mut(level);
+        routes.remove(&prefix);
 
         // Schedule LSP reorigination.
         if let Some((mut instance, _)) = instance.as_up() {

holo-isis/src/instance.rs

@@ -19,7 +19,8 @@ use holo_protocol::{
 use holo_utils::ibus::IbusMsg;
 use holo_utils::protocol::Protocol;
 use holo_utils::task::TimeoutTask;
-use ipnetwork::{IpNetwork, Ipv4Network, Ipv6Network};
+use ipnetwork::IpNetwork;
+use prefix_trie::joint::map::JointPrefixMap;
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::{Receiver, Sender, UnboundedReceiver, UnboundedSender};
 
@@ -66,8 +67,7 @@ pub struct InstanceSys {
     // System Router ID.
     pub router_id: Option<Ipv4Addr>,
     // Redistributed routes.
-    pub ipv4_routes: Levels<BTreeMap<Ipv4Network, RouteSys>>,
-    pub ipv6_routes: Levels<BTreeMap<Ipv6Network, RouteSys>>,
+    pub routes: Levels<JointPrefixMap<IpNetwork, RouteSys>>,
 }
 
 #[derive(Debug)]

holo-isis/src/interface.rs

@@ -12,11 +12,12 @@ use std::sync::Arc;
 use std::sync::atomic::AtomicU32;
 
 use chrono::{DateTime, Utc};
-use holo_utils::ip::AddressFamily;
+use holo_utils::ip::{AddressFamily, JointPrefixSetExt};
 use holo_utils::socket::{AsyncFd, Socket, SocketExt};
 use holo_utils::southbound::InterfaceFlags;
 use holo_utils::task::{IntervalTask, Task, TimeoutTask};
-use ipnetwork::{Ipv4Network, Ipv6Network};
+use ipnetwork::IpNetwork;
+use prefix_trie::joint::set::JointPrefixSet;
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::UnboundedSender;
 
@@ -51,8 +52,7 @@ pub struct InterfaceSys {
     pub ifindex: Option<u32>,
     pub mtu: Option<u32>,
     pub mac_addr: Option<[u8; 6]>,
-    pub ipv4_addr_list: BTreeSet<Ipv4Network>,
-    pub ipv6_addr_list: BTreeSet<Ipv6Network>,
+    pub addr_list: JointPrefixSet<IpNetwork>,
 }
 
 #[derive(Debug, Default)]
@@ -551,7 +551,7 @@ impl Interface {
         {
             protocols_supported.push(Nlpid::Ipv4 as u8);
             ipv4_addrs.extend(
-                self.system.ipv4_addr_list.iter().map(|addr| addr.ip()),
+                self.system.addr_list.ipv4().iter().map(|addr| addr.ip()),
             );
         }
         if self
@@ -561,7 +561,8 @@ impl Interface {
             protocols_supported.push(Nlpid::Ipv6 as u8);
             ipv6_addrs.extend(
                 self.system
-                    .ipv6_addr_list
+                    .addr_list
+                    .ipv6()
                     .iter()
                     .filter(|addr| addr.ip().is_unicast_link_local())
                     .map(|addr| addr.ip()),

holo-isis/src/lsdb.rs

@@ -18,7 +18,10 @@ use holo_utils::bier::{
     BierEncapId, BierEncapsulationType, BierInBiftId, BiftId,
     UnderlayProtocolType,
 };
-use holo_utils::ip::{AddressFamily, Ipv4NetworkExt, Ipv6NetworkExt};
+use holo_utils::ip::{
+    AddressFamily, Ipv4NetworkExt, Ipv6NetworkExt, JointPrefixMapExt,
+    JointPrefixSetExt,
+};
 use holo_utils::mpls::Label;
 use holo_utils::sr::{IgpAlgoType, Sid, SidLastHopBehavior, SrCfgPrefixSid};
 use holo_utils::task::TimeoutTask;
@@ -639,7 +642,7 @@ fn lsp_build_tlvs_ip_local(
         .is_af_enabled(AddressFamily::Ipv4, instance.config)
     {
         let metric_type = instance.config.metric_type.get(level);
-        for addr in iface.system.ipv4_addr_list.iter() {
+        for addr in iface.system.addr_list.ipv4().iter() {
             ipv4_addrs.insert(addr.ip());
 
             let prefix = addr.apply_mask();
@@ -693,7 +696,8 @@ fn lsp_build_tlvs_ip_local(
     {
         for addr in iface
             .system
-            .ipv6_addr_list
+            .addr_list
+            .ipv6()
             .iter()
             .filter(|addr| !addr.ip().is_unicast_link_local())
         {
@@ -736,7 +740,7 @@ fn lsp_build_tlvs_ip_redistributed(
 ) {
     if instance.config.is_af_enabled(AddressFamily::Ipv4) {
         let metric_type = instance.config.metric_type.get(level);
-        for (prefix, route) in instance.system.ipv4_routes.get(level) {
+        for (prefix, route) in instance.system.routes.get(level).ipv4() {
             let prefix = prefix.apply_mask();
             if metric_type.is_standard_enabled() {
                 ipv4_external_reach.insert(
@@ -774,7 +778,7 @@ fn lsp_build_tlvs_ip_redistributed(
         }
     }
     if instance.config.is_af_enabled(AddressFamily::Ipv6) {
-        for (prefix, route) in instance.system.ipv6_routes.get(level) {
+        for (prefix, route) in instance.system.routes.get(level).ipv6() {
             let prefix = prefix.apply_mask();
             let prefix_attr_flags = PrefixAttrFlags::empty();
             let sub_tlvs = lsp_build_ipv6_reach_stlvs(

holo-isis/src/northbound/configuration.rs

@@ -21,7 +21,7 @@ use holo_northbound::configuration::{
 use holo_northbound::yang::control_plane_protocol::isis;
 use holo_utils::bfd;
 use holo_utils::crypto::CryptoAlgo;
-use holo_utils::ip::AddressFamily;
+use holo_utils::ip::{AddressFamily, IpNetworkKind};
 use holo_utils::keychain::{Key, Keychains};
 use holo_utils::protocol::Protocol;
 use holo_utils::yang::DataNodeRefExt;
@@ -2176,16 +2176,10 @@ impl Provider for Instance {
                 self.tx.ibus.route_redistribute_unsub(protocol, Some(af));
 
                 // Remove redistributed routes.
-                match af {
-                    AddressFamily::Ipv4 => {
-                        let routes = self.system.ipv4_routes.get_mut(level);
-                        routes.retain(|_, route| route.protocol != protocol);
-                    }
-                    AddressFamily::Ipv6 => {
-                        let routes = self.system.ipv6_routes.get_mut(level);
-                        routes.retain(|_, route| route.protocol != protocol);
-                    }
-                }
+                let routes = self.system.routes.get_mut(level);
+                routes.retain(|prefix, route| {
+                    prefix.address_family() != af || route.protocol != protocol
+                });
 
                 // Schedule LSP reorigination.
                 if let Some((mut instance, _)) = self.as_up() {

holo-utils/src/ip.rs

@@ -13,8 +13,9 @@ use arbitrary::Arbitrary;
 use holo_yang::{ToYang, TryFromYang};
 use ipnetwork::{IpNetwork, IpNetworkError, Ipv4Network, Ipv6Network};
 use num_derive::{FromPrimitive, ToPrimitive};
-use prefix_trie::PrefixMap;
 use prefix_trie::joint::map::JointPrefixMap;
+use prefix_trie::joint::set::JointPrefixSet;
+use prefix_trie::{PrefixMap, PrefixSet};
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 
@@ -218,6 +219,20 @@ pub trait JointPrefixMapExt<T> {
     fn ipv6_mut(&mut self) -> &mut PrefixMap<Ipv6Network, T>;
 }
 
+pub trait JointPrefixSetExt {
+    // Returns a reference to the IPv4 prefix set.
+    fn ipv4(&self) -> &PrefixSet<Ipv4Network>;
+
+    // Returns a mutable reference to the IPv4 prefix set.
+    fn ipv4_mut(&mut self) -> &mut PrefixSet<Ipv4Network>;
+
+    // Returns a reference to the IPv6 prefix set.
+    fn ipv6(&self) -> &PrefixSet<Ipv6Network>;
+
+    // Returns a mutable reference to the IPv6 prefix set.
+    fn ipv6_mut(&mut self) -> &mut PrefixSet<Ipv6Network>;
+}
+
 // ===== impl AddressFamily =====
 
 impl AddressFamily {
@@ -680,7 +695,7 @@ impl SocketAddrKind<Ipv6Addr> for SocketAddrV6 {
     }
 }
 
-// ===== impl SocketAddrV6 =====
+// ===== impl JointPrefixMap =====
 
 impl<T> JointPrefixMapExt<T> for JointPrefixMap<IpNetwork, T> {
     fn ipv4(&self) -> &PrefixMap<Ipv4Network, T> {
@@ -699,3 +714,23 @@ impl<T> JointPrefixMapExt<T> for JointPrefixMap<IpNetwork, T> {
         &mut self.t2
     }
 }
+
+// ===== impl JointPrefixSet =====
+
+impl JointPrefixSetExt for JointPrefixSet<IpNetwork> {
+    fn ipv4(&self) -> &PrefixSet<Ipv4Network> {
+        &self.t1
+    }
+
+    fn ipv4_mut(&mut self) -> &mut PrefixSet<Ipv4Network> {
+        &mut self.t1
+    }
+
+    fn ipv6(&self) -> &PrefixSet<Ipv6Network> {
+        &self.t2
+    }
+
+    fn ipv6_mut(&mut self) -> &mut PrefixSet<Ipv6Network> {
+        &mut self.t2
+    }
+}