mirror of
https://github.com/LibreQoE/LibreQoS.git
synced 2026-10-25 14:20:05 -05:00
Update csvToNetworkJSON.py to use the new config
This commit is contained in:
1 parent
3cf097c78f
commit
342176d6c2
2 files changed
+9
-3
No files matched your search
@@ -3,8 +3,7 @@ checkPythonVersion()
|
||||
import os
|
||||
import csv
|
||||
import json
|
||||
from ispConfig import uispSite, uispStrategy, overwriteNetworkJSONalways
|
||||
from ispConfig import generatedPNUploadMbps, generatedPNDownloadMbps, upstreamBandwidthCapacityDownloadMbps, upstreamBandwidthCapacityUploadMbps
|
||||
from liblqos_python import overwrite_network_json_always
|
||||
from integrationCommon import NetworkGraph, NetworkNode, NodeType
|
||||
|
||||
def csvToNetworkJSONfile():
|
||||
@@ -46,7 +45,7 @@ def csvToNetworkJSONfile():
|
||||
net.prepareTree()
|
||||
net.plotNetworkGraph(False)
|
||||
if net.doesNetworkJsonExist():
|
||||
if overwriteNetworkJSONalways:
|
||||
if overwrite_network_json_always():
|
||||
net.createNetworkJson()
|
||||
else:
|
||||
print("network.json already exists and overwriteNetworkJSONalways set to False. Leaving in-place.")
|
||||
|
||||
@@ -46,6 +46,7 @@ fn liblqos_python(_py: Python, m: &PyModule) -> PyResult<()> {
|
||||
m.add_wrapped(wrap_pyfunction!(generated_pn_upload_mbps))?;
|
||||
m.add_wrapped(wrap_pyfunction!(queues_available_override))?;
|
||||
m.add_wrapped(wrap_pyfunction!(on_a_stick))?;
|
||||
m.add_wrapped(wrap_pyfunction!(overwrite_network_json_always))?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -355,4 +356,10 @@ fn queues_available_override() -> PyResult<u32> {
|
||||
fn on_a_stick() -> PyResult<bool> {
|
||||
let config = lqos_config::load_config().unwrap();
|
||||
Ok(config.on_a_stick_mode())
|
||||
}
|
||||
|
||||
#[pyfunction]
|
||||
fn overwrite_network_json_always() -> PyResult<bool> {
|
||||
let config = lqos_config::load_config().unwrap();
|
||||
Ok(config.integration_common.always_overwrite_network_json)
|
||||
}
|
||||
Reference in new issue
Block a user