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.

src/rust/lqos_python/src/lib.rs

@@ -90,6 +90,7 @@ fn liblqos_python(_py: Python, m: &PyModule) -> PyResult<()> {
  m.add_wrapped(wrap_pyfunction!(influx_db_url))?;
  m.add_wrapped(wrap_pyfunction!(get_weights))?;
  m.add_wrapped(wrap_pyfunction!(get_tree_weights))?;
+ m.add_wrapped(wrap_pyfunction!(get_libreqos_directory))?;
 
  Ok(())
 }
@@ -661,4 +662,10 @@ pub fn get_tree_weights() -> PyResult<Vec<device_weights::NetworkNodeWeight>> {
  Err(PyOSError::new_err(e.to_string()))
  }
  }
+}
+
+#[pyfunction]
+pub fn get_libreqos_directory() -> PyResult<String> {
+ let config = lqos_config::load_config().unwrap();
+ Ok(config.lqos_directory)
 }

src/scheduler.py

@@ -2,10 +2,9 @@
 import datetime
 from LibreQoS import refreshShapers, refreshShapersUpdateOnly
 from graphInfluxDB import refreshBandwidthGraphs, refreshLatencyGraphs
+import subprocess
 from liblqos_python import automatic_import_uisp, automatic_import_splynx, queue_refresh_interval_mins, \
- automatic_import_powercode, automatic_import_sonar, influx_db_enabled
-if automatic_import_uisp():
- from integrationUISP import importFromUISP
+ automatic_import_powercode, automatic_import_sonar, influx_db_enabled, get_libreqos_directory
 if automatic_import_splynx():
  from integrationSplynx import importFromSplynx
 if automatic_import_powercode():
@@ -20,7 +19,9 @@
 def importFromCRM():
  if automatic_import_uisp():
  try:
- importFromUISP()
+ # Call bin/uisp_integration
+ path = get_libreqos_directory() + "/bin/uisp_integration"
+ subprocess.run([path])
  except:
  print("Failed to import from UISP")
  elif automatic_import_splynx():