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

Correct traversal depth

Browse Source
This commit is contained in:
Herbert Wolverson 2024-04-23 14:01:22 -05:00
parent 0328bc10a3
commit 2cfd1f90b7
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rust/uisp_integration/src/strategies/full/network_json.rs
View File

@ -18,13 +18,15 @@ pub fn write_network_file(
// Write the network JSON file
let root = traverse_sites(sites, root_idx, 0)?;
let json = serde_json::to_string_pretty(&root).unwrap();
write(network_path, &json).map_err(|e| {
error!("Unable to write network.json");
error!("{e:?}");
UispIntegrationError::WriteNetJson
})?;
info!("Written network.json");
if let Some(children) = root.get("children") {
let json = serde_json::to_string_pretty(&children).unwrap();
write(network_path, &json).map_err(|e| {
error!("Unable to write network.json");
error!("{e:?}");
UispIntegrationError::WriteNetJson
})?;
info!("Written network.json");
}
Ok(())
}
@ -48,7 +50,7 @@ fn traverse_sites(
_ => "site",
};
if depth < 2 {
if depth < 10 {
let mut children = serde_json::Map::new();
for (child_id, child) in sites.iter().enumerate() {
if let Some(parent) = child.selected_parent {

2
src/rust/uisp_integration/src/strategies/full/shaped_devices_writer.rs
View File

@ -85,7 +85,7 @@ fn traverse(
circuit_name: sites[idx].name.clone(),
device_id: device.id.clone(),
device_name: device.name.clone(),
parent_node: sites[idx].name.clone(),
parent_node: sites[sites[idx].selected_parent.unwrap()].name.clone(),
mac: device.mac.clone(),
ipv4: device.ipv4_list(),
ipv6: device.ipv6_list(),