IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adds an 'orphaned nodes' entry that acts as a catch-all for entries for whom a parent could not be deduced.

Browse Source
This commit is contained in:
Herbert Wolverson 2024-04-30 10:59:19 -05:00
parent b4e3484ff1
commit 49d261fb85
2 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rust/uisp_integration/src/strategies/full/mod.rs
View File

@ -25,7 +25,7 @@ use crate::strategies::full::shaped_devices_writer::write_shaped_devices;
use crate::strategies::full::squash_single_entry_aps::squash_single_aps;
use crate::strategies::full::tree_walk::walk_tree_for_routing;
use crate::strategies::full::uisp_fetch::load_uisp_data;
use crate::strategies::full::utils::{print_sites, warn_of_no_parents};
use crate::strategies::full::utils::{print_sites, warn_of_no_parents_and_promote};
use crate::uisp_types::{UispSite, UispSiteType};
pub use bandwidth_overrides::BandwidthOverrides;
use lqos_config::Config;
@ -101,11 +101,13 @@ pub async fn build_full_network(
// Correct any sites with zero capacity
correct_zero_capacity_sites(&mut sites, &config);
// Issue No Parent Warnings
warn_of_no_parents(&sites, &devices_raw);
// Print Sites
if let Some(root_idx) = sites.iter().position(|s| s.name == root_site) {
// Issue No Parent Warnings
warn_of_no_parents_and_promote(&mut sites, &devices_raw, root_idx, &config);
print_sites(&sites, root_idx);
// Output a network.json

37
src/rust/uisp_integration/src/strategies/full/utils.rs
View File

@ -1,5 +1,6 @@
use crate::uisp_types::UispSite;
use crate::uisp_types::{UispSite, UispSiteType};
use tracing::warn;
use lqos_config::Config;
use uisp::Device;
/// Counts how many devices are present at a siteId. It's a simple
@ -45,13 +46,41 @@ fn iterate_child_sites(sites: &[UispSite], parent: usize, indent: usize) {
});
}
pub fn warn_of_no_parents(sites: &[UispSite], devices_raw: &[Device]) {
pub fn warn_of_no_parents_and_promote(sites: &mut Vec<UispSite>, devices_raw: &[Device], root_idx: usize, config: &Config) {
let mut orphans = Vec::new();
sites
.iter()
.filter(|s| s.parent_indices.is_empty())
.filter(|s| s.selected_parent.is_none())
.for_each(|s| {
if count_devices_in_site(&s.id, &devices_raw) > 0 {
if count_devices_in_site(&s.id, devices_raw) > 0 {
warn!("Site: {} has no parents", s.name);
orphans.push(s.id.clone());
}
});
// If we have orphans, promote them to be parented off of a special branch
if !orphans.is_empty() {
let orgphanage_id = sites.len();
let orphanage = UispSite {
id: "orphans".to_string(),
name: "Orphaned Nodes".to_string(),
site_type: UispSiteType::Site,
uisp_parent_id: None,
parent_indices: Default::default(),
max_down_mbps: config.queues.downlink_bandwidth_mbps,
max_up_mbps: config.queues.uplink_bandwidth_mbps,
suspended: false,
device_indices: vec![],
route_weights: vec![],
selected_parent: Some(root_idx),
};
sites.push(orphanage);
for orphan_id in orphans {
if let Some((_, site)) = sites.iter_mut().enumerate().find(|(idx, s)| *idx != root_idx && s.id == orphan_id) {
site.selected_parent = Some(orgphanage_id);
}
}
}
}