Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bier: BIFT computation and synchronization with Fastclick #32

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

bier: BIFT computation and synchronization with Fastclick #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2f4d38c
bier: BIFT computation and synchronization with Fastclick
nrybowski Oct 1, 2024
919eea8
bier: Add custom errors for BfrId and Bitstring
nrybowski Oct 1, 2024
b23ee51
bier: Inject BFR prefix into BIFT
nrybowski Oct 29, 2024
efb7ba6
bier: Gating FastClick behind optional feature
nrybowski Oct 30, 2024
7b93b30
bier: Batch BIFT entries addition
nrybowski Oct 31, 2024
80c834d
bier/birt: Fix nexthop selection and interface update
nrybowski Feb 20, 2025
8a58fc4
bier: Add BIFT configuration through YANG
nrybowski Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ Holo supports the following Internet Standards:
| ietf-bfd@2022-09-22 | 100.00% | 100.00% | - | - | [100.00%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
| ietf-bgp-policy@2023-07-05 | 100.00% | - | - | - | [100.00%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
| ietf-bgp@2023-07-05 | 32.38% | 85.95% | - | - | [60.40%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
| ietf-bier@2023-09-12 | 65.52% | - | - | 0.00% | [47.50%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
| ietf-bier@2023-09-12 | 100.00% | - | - | 0.00% | [72.50%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
| ietf-if-extensions@2023-01-26 | 100.00% | 0.00% | - | - | [50.00%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
| ietf-if-vlan-encapsulation@2023-01-26 | 42.86% | - | - | - | [42.86%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
| ietf-interfaces@2018-02-20 | 100.00% | 0.00% | - | - | [22.22%](https://holo-routing.github.io/ietf-yang-coverage/[email protected]) |
Expand Down
2 changes: 2 additions & 0 deletions holo-daemon/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,5 @@ vrrp = ["dep:holo-vrrp", "holo-interface/vrrp"]
# Other features
tokio_console = ["dep:console-subscriber"]
io_uring = ["dep:tokio-uring"]

fastclick = ["holo-utils/fastclick"]
40 changes: 22 additions & 18 deletions holo-routing/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,24 +91,28 @@ impl Master {

loop {
tokio::select! {
Some(request) = nb_rx.recv() => {
process_northbound_msg(
self,
&mut resources,
request,
)
.await;
}
Some(msg) = ibus_rx.recv() => {
ibus::process_msg(self, msg);
}
Some(_) = self.rib.update_queue_rx.recv() => {
self.rib
.process_rib_update_queue(
&self.netlink_handle,
)
.await;
}
Some(request) = nb_rx.recv() => {
process_northbound_msg(
self,
&mut resources,
request,
)
.await;
}
Some(msg) = ibus_rx.recv() => {
ibus::process_msg(self, msg);
}
Some(_) = self.rib.update_queue_rx.recv() => {
self.rib
.process_rib_update_queue(
&self.netlink_handle,
)
.await;
}
Some(_) = self.birt.update_queue_rx.recv() => {
self.birt
.process_birt_update_queue(&self.interfaces).await;
}
}
}
}
Expand Down
175 changes: 173 additions & 2 deletions holo-routing/src/northbound/configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ use holo_northbound::yang::routing::segment_routing::sr_mpls;
use holo_northbound::yang::routing::{bier, ribs};
use holo_northbound::{CallbackKey, NbDaemonSender};
use holo_utils::bier::{
BierCfgEvent, BierEncapsulation, BierEncapsulationType, BierInBiftId,
BierSubDomainCfg, Bsl, SubDomainId, UnderlayProtocolType,
BfrId, BierBift, BierBiftCfg, BierCfgEvent, BierEncapsulation,
BierEncapsulationType, BierInBiftId, BierOutBiftId, BierSubDomainCfg,
BiftNbr, Bsl, SubDomainId, UnderlayProtocolType,
};
use holo_utils::ibus::IbusMsg;
use holo_utils::ip::{AddressFamily, IpNetworkKind};
Expand Down Expand Up @@ -60,6 +61,9 @@ pub enum ListEntry {
Bsl,
BierEncapsulationType,
),
BierCfgBift(BfrId),
BierCfgBiftBsl(BfrId, Bsl),
BierCfgBiftNbr(BfrId, Bsl, IpAddr),
}

#[derive(Debug, EnumAsInner)]
Expand All @@ -78,6 +82,7 @@ pub enum Event {
BierCfgUpdate,
BierCfgEncapUpdate(SubDomainId, AddressFamily, Bsl, BierEncapsulationType),
BierCfgSubDomainUpdate(AddressFamily),
BierCfgBiftUpdate(BfrId),
}

// ===== configuration structs =====
Expand Down Expand Up @@ -873,6 +878,169 @@ fn load_callbacks() -> Callbacks<Master> {
.delete_apply(|_context, _args| {
// Nothing to do.
})
.path(bier::bift::PATH)
.create_apply(|master, args| {
let bfr_id = args.dnode.get_u16_relative("./bfr-id").unwrap();

let bift_cfg = BierBiftCfg {
bfr_id,
birt: Default::default()
};

master.bier_config.bift_cfg.insert(bfr_id, bift_cfg);
let event_queue = args.event_queue;
event_queue.insert(Event::BierCfgUpdate);
event_queue.insert(Event::BierCfgBiftUpdate(bfr_id));
})
.delete_apply(|master, args| {
let bfr_id = args.dnode.get_u16_relative("./bfr-id").unwrap();
master.bier_config.bift_cfg.remove(&bfr_id);

let event_queue = args.event_queue;
event_queue.insert(Event::BierCfgUpdate);
event_queue.insert(Event::BierCfgBiftUpdate(bfr_id));
})
.lookup(|_master, _list_entry, dnode| {
let bfr_id = dnode.get_u16_relative("./bfr-id").unwrap();
ListEntry::BierCfgBift(bfr_id)
})
.path(bier::bift::birt_bitstringlength::PATH)
.create_apply(|context, args| {
let bfr_id = args.list_entry.into_bier_cfg_bift().unwrap();
let bift_cfg = context.bier_config.bift_cfg.get_mut(&bfr_id).unwrap();

let bsl = args.dnode.get_string_relative("./bsl").unwrap();
let bsl = Bsl::try_from_yang(&bsl).unwrap();

let bift = BierBift {
bsl,
nbr: Default::default()
};

bift_cfg.birt.insert(bsl, bift);

let event_queue = args.event_queue;
event_queue.insert(Event::BierCfgUpdate);
// FIXME: Create custom event?
})
.delete_apply(|context, args| {
let bfr_id = args.list_entry.into_bier_cfg_bift().unwrap();
let bift_cfg = context.bier_config.bift_cfg.get_mut(&bfr_id).unwrap();

let bsl = args.dnode.get_string_relative("./bsl").unwrap();
let bsl = Bsl::try_from_yang(&bsl).unwrap();

bift_cfg.birt.remove(&bsl);
let event_queue = args.event_queue;
event_queue.insert(Event::BierCfgUpdate);
// FIXME: Create custom event?
})
.lookup(|_master, list_entry, dnode| {
let bfr_id = list_entry.into_bier_cfg_bift().unwrap();

let bsl = dnode.get_string_relative("./bsl").unwrap();
let bsl = Bsl::try_from_yang(&bsl).unwrap();

ListEntry::BierCfgBiftBsl(bfr_id, bsl)
})
.path(bier::bift::birt_bitstringlength::bfr_nbr::PATH)
.create_apply(|context, args| {
let (bfr_id, bsl) = args.list_entry.into_bier_cfg_bift_bsl().unwrap();
let bift_config = context.bier_config.bift_cfg.get_mut(&bfr_id).unwrap();
let birt = bift_config.birt.get_mut(&bsl).unwrap();

let bfr_nbr = args.dnode.get_ip_relative("./bfr-nbr").unwrap();
let encap_type = args.dnode.get_string_relative("./encapsulation-type").unwrap();
let encap_type = BierEncapsulationType::try_from_yang(&encap_type).unwrap();
let out_bift_id = args.dnode.get_u32_relative("./out-bift-id/out-bift-id");
let out_bift_encoding = args.dnode.get_bool_relative("./out-bift-id/out-bift-id-encoding");
let out_bift_id = out_bift_id.map_or(out_bift_encoding.map(BierOutBiftId::Encoding), |v| Some(BierOutBiftId::Defined(v))).unwrap();

let nbr = BiftNbr {
bfr_nbr,
encap_type,
out_bift_id
};

birt.nbr.insert(bfr_nbr, nbr);

let event_queue = args.event_queue;
event_queue.insert(Event::BierCfgUpdate);
// FIXME: Custom event?
})
.delete_apply(|context, args| {
let (bfr_id, bsl) = args.list_entry.into_bier_cfg_bift_bsl().unwrap();
let bift_config = context.bier_config.bift_cfg.get_mut(&bfr_id).unwrap();
let birt = bift_config.birt.get_mut(&bsl).unwrap();

let bfr_nbr = args.dnode.get_ip_relative("./bfr-nbr").unwrap();

birt.nbr.remove(&bfr_nbr);

let event_queue = args.event_queue;
event_queue.insert(Event::BierCfgUpdate);
// FIXME: Custom event?
})
.lookup(|_context, list_entry, dnode| {
let (bfr_id, bsl) = list_entry.into_bier_cfg_bift_bsl().unwrap();
let nbr = dnode.get_ip_relative("./bfr-nbr").unwrap();

ListEntry::BierCfgBiftNbr(bfr_id, bsl, nbr)
})
.path(bier::bift::birt_bitstringlength::bfr_nbr::encapsulation_type::PATH)
.modify_apply(|context, args| {
let (bfr_id, bsl, nbr) = args.list_entry.into_bier_cfg_bift_nbr().unwrap();

let bift_config = context.bier_config.bift_cfg.get_mut(&bfr_id).unwrap();
let birt = bift_config.birt.get_mut(&bsl).unwrap();
let nbr = birt.nbr.get_mut(&nbr).unwrap();

let encap_type = args.dnode.get_string_relative("./encapsulation-type").unwrap();
nbr.encap_type = BierEncapsulationType::try_from_yang(&encap_type).unwrap();

let event_queue = args.event_queue;
event_queue.insert(Event::BierCfgUpdate);
// FIXME: Custom event?
})
.delete_apply(|_context, _args| {
// Nothing to do.
})
.path(bier::bift::birt_bitstringlength::bfr_nbr::out_bift_id::out_bift_id::PATH)
.modify_apply(|context, args| {
let (bfr_id, bsl, nbr) = args.list_entry.into_bier_cfg_bift_nbr().unwrap();

let bift_config = context.bier_config.bift_cfg.get_mut(&bfr_id).unwrap();
let birt = bift_config.birt.get_mut(&bsl).unwrap();
let nbr = birt.nbr.get_mut(&nbr).unwrap();

let out_bift_id = args.dnode.get_u32_relative("./out-bift-id/out-bift-id").unwrap();
nbr.out_bift_id = BierOutBiftId::Defined(out_bift_id);

let event_queue = args.event_queue;
event_queue.insert(Event::BierCfgUpdate);
// FIXME: Custom event?
})
.delete_apply(|_context, _args| {
// Nothing to do.
})
.path(bier::bift::birt_bitstringlength::bfr_nbr::out_bift_id::out_bift_id_encoding::PATH)
.modify_apply(|context, args| {
let (bfr_id, bsl, nbr) = args.list_entry.into_bier_cfg_bift_nbr().unwrap();

let bift_config = context.bier_config.bift_cfg.get_mut(&bfr_id).unwrap();
let birt = bift_config.birt.get_mut(&bsl).unwrap();
let nbr = birt.nbr.get_mut(&nbr).unwrap();

let out_bift_id_encoding = args.dnode.get_bool_relative("./out-bift-id/out-bift-id-encoding").unwrap();
nbr.out_bift_id = BierOutBiftId::Encoding(out_bift_id_encoding);

let event_queue = args.event_queue;
event_queue.insert(Event::BierCfgUpdate);
// FIXME: Custom event?
})
.delete_apply(|_context, _args| {
// Nothing to do.
})
.build()
}

Expand Down Expand Up @@ -1102,6 +1270,9 @@ impl Provider for Master {
));
}
}
Event::BierCfgBiftUpdate(_bfr_id) => {
// TODO
}
}
}
}
Expand Down
Loading