Commit Graph

2411 Commits

Author SHA1 Message Date
Herbert Wolverson
383c410eed ISSUE #501. Don't ignore the first line of the incoming file as a header. Generally clean up the loading routine. 2024-06-25 08:56:07 -05:00
Herbert Wolverson
18344c7cd2 Add support for bin/post_integration_hook.sh in scheduler.py
Scheduler.py now checks for the existence of a `bin/post_integration_hook.sh`
script. If it exists, it is executed immediately after CRM updating and
before LibreQoS is refreshed.

This gives an opportuntity to start adding additional chains of calls
to work with your shaped devices and network.json after CRM retrieval,
and before pushing to live.
2024-06-19 15:20:34 -05:00
Herbert Wolverson
2958314d5f UISP Integration - make squash more conservative about which sites it adjusts bandwidth. Clients only. 2024-06-18 09:21:35 -05:00
Herbert Wolverson
4930c47ab0 ISSUE #499
* Adds a "get LibreQOS directory" function to the Python library.
* Uses it to establish the correct location for uisp_integration.
* Modifies `scheduler.py` to call the new UISP integration directly.
2024-06-17 08:50:57 -05:00
Herbert Wolverson
6ed0b88104 Remove one more stale unit test 2024-06-15 10:16:09 -05:00
Herbert Wolverson
ea6d0b6006 Fix a unit test that had aged beyond the code it was testing and was no longer valid. 2024-06-15 10:11:02 -05:00
Herbert Wolverson
3c6cae7959 CLOSES #497
This replaced PR #497, and applies the same updates - now taking
into account the merged code.
2024-06-15 09:50:23 -05:00
Herbert "TheBracket
24f59e1d3d
Merge pull request #491 from LibreQoE/preflight-bridge-check
Preflight bridge check with relaxed interface status checks
2024-06-15 09:49:17 -05:00
Herbert "TheBracket
ced169f1cd
Merge pull request #479 from LibreQoE/uisp_integration_2
Uisp integration 2
2024-06-15 09:44:53 -05:00
Herbert Wolverson
c9f9c51e7e Merge with develop to resolve update conflicts and preserve building both the support tool and this branch (both modified build scripts on the same lines) 2024-06-15 09:43:11 -05:00
Herbert Wolverson
564eb7297b Cargo.lock update 2024-06-15 09:37:39 -05:00
Herbert Wolverson
2dbdd1c038 Re-enable AP speed selection. 2024-06-15 09:15:01 -05:00
Herbert Wolverson
20a7e3512d Fix a subtle bug that when squashing sites that only have one decendent, speeds were being applied incorrectly. 2024-06-15 09:15:01 -05:00
Herbert Wolverson
779ef162d3 Trying Robert's suggestion for using min when promoting access devices. 2024-06-15 09:15:01 -05:00
Herbert Wolverson
680851b5a8 I believe this fixes the client site speed issue. 2024-06-15 09:15:01 -05:00
Robert Chacón
420b6e1ca6 Update mikrotikFindIPv6.py 2024-06-15 09:15:01 -05:00
Herbert Wolverson
b51c7a35bc Now with the mising file. Sorry. 2024-06-15 09:15:01 -05:00
Herbert Wolverson
a72e6ae4ff Implement a full PyO3 system to run mikrotikFindIPv6.py in-process as part of the uisp_integration run, and retrieve results. The results are then applied. 2024-06-15 09:14:58 -05:00
Herbert Wolverson
bb75727940 Second environment variable override option. Set LQOS_CONFIG to the location of a .conf file, and that one will be loaded instead of the hard-coded path. This is also intended to help with multiple instances. 2024-06-15 09:14:53 -05:00
Herbert Wolverson
297bdcd58e Add support for LQOS_DIRECTORY environment variable overriding the
saved value when loading the config file.

If LQOS_DIRECTORY is not set, nothing happens.

If LQOS_DIRECTORY is set---for example with:

```
export LQOS_DIRECTORY="/opt/libreqos2"
```

Then the directory is overridden in the loaded configuration from
the environment variable.

This is designed to make it easier to have multiple instances---for
example for building configuration and then distributing it.
2024-06-15 09:14:53 -05:00
Robert Chacón
78c2388501 Update bandwidth_overrides.rs 2024-06-15 09:14:53 -05:00
Robert Chacón
b4619da030 Update network_json.rs 2024-06-15 09:14:53 -05:00
Herbert Wolverson
21b1f4d24b More unit tests for bandwidth overrides 2024-06-15 09:14:53 -05:00
Herbert Wolverson
1952498ce2 Add documentation and cleanup 2024-06-15 09:14:53 -05:00
Herbert Wolverson
3696c14fc9 Some more linter suggestions applied 2024-06-15 09:14:53 -05:00
Herbert Wolverson
cbd0a785ce Format run 2024-06-15 09:14:53 -05:00
Herbert Wolverson
abe16aff39 Linter and cleanup run 2024-06-15 09:14:53 -05:00
Herbert Wolverson
d058b49d0f Add debug code to bandwidth overrides, and suddenly it works? 2024-06-15 09:14:53 -05:00
Herbert Wolverson
49d261fb85 Adds an 'orphaned nodes' entry that acts as a catch-all for entries for whom a parent could not be deduced. 2024-06-15 09:14:53 -05:00
Herbert Wolverson
b4e3484ff1 Handle floats and ints in overrides 2024-06-15 09:14:53 -05:00
Herbert Wolverson
6f986f4cd1 Handle exception CPE reparenting. 2024-06-15 09:14:53 -05:00
Herbert Wolverson
631b9672f5 Bandwidth overrides are correctly applied. 2024-06-15 09:14:53 -05:00
Herbert Wolverson
1c0aba7c78 Add a zero-capacity site correction to UISP integration. 2024-06-15 09:14:53 -05:00
Herbert Wolverson
4e3da50adf Add minimums to calculated min/max speeds - missed a bit. 2024-06-15 09:14:53 -05:00
Herbert Wolverson
0851a02084 Add minimums to calculated min/max speeds. 2024-06-15 09:14:53 -05:00
Herbert Wolverson
d1b9b4e02a More depth tweaking 2024-06-15 09:14:53 -05:00
Herbert Wolverson
2cfd1f90b7 Correct traversal depth 2024-06-15 09:14:53 -05:00
Herbert Wolverson
0328bc10a3 Correct output IP format. 2024-06-15 09:14:53 -05:00
Herbert Wolverson
05e4a2f59f Correct output order in CSV files 2024-06-15 09:14:53 -05:00
Herbert Wolverson
b6eadc2edf Add in a flat exporter 2024-06-15 09:14:53 -05:00
Herbert Wolverson
db2a301019 Include uisp_integration in build_rust and the build_dpkg scripts. Adjust the scheduler to use subprocess.run to call the new integration. 2024-06-15 09:14:51 -05:00
Herbert Wolverson
14d466898c Format run 2024-06-15 09:12:46 -05:00
Herbert Wolverson
250c091eee Add ShapedDevices.csv creation. 2024-06-15 09:12:45 -05:00
Herbert Wolverson
557d51b53d Add writing network.json 2024-06-15 09:12:41 -05:00
Herbert Wolverson
d7181a663d Support routing overrides 2024-06-15 09:12:37 -05:00
Herbert Wolverson
6cd3993a34 Change client promotion strategy slightly, now it lines up on my system. 2024-06-15 09:12:37 -05:00
Herbert Wolverson
78a8f6dad1 Support for i64 capacaty on devices. 2024-06-15 09:12:37 -05:00
Herbert Wolverson
702c913a01 Re-add disconnected warning. 2024-06-15 09:12:37 -05:00
Herbert Wolverson
5ac3e45aee Reversed links are now handled correctly. 2024-06-15 09:12:37 -05:00
Herbert Wolverson
cfab0ae924 Include 'back' links - so to/from order is irrelevant. 2024-06-15 09:12:35 -05:00