From 9d2a44a987b7f1d788878a101dd0736ece3ed617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Sun, 24 Mar 2024 11:38:57 -0600 Subject: [PATCH] Revert "UISP Fix - Flat Network" --- src/integrationUISP.py | 10 ---------- src/ispConfig.example.py | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/integrationUISP.py b/src/integrationUISP.py index 046f7f73..fa1b8dd2 100644 --- a/src/integrationUISP.py +++ b/src/integrationUISP.py @@ -65,16 +65,6 @@ def buildFlatGraph(): if (site['qos']['downloadSpeed']) and (site['qos']['uploadSpeed']): download = int(round(site['qos']['downloadSpeed']/1000000)) upload = int(round(site['qos']['uploadSpeed']/1000000)) - if site['identification'] is not None and site['identification']['suspended'] is not None and site['identification']['suspended'] == True: - if uisp_suspended_strategy() == "ignore": - print("WARNING: Site " + name + " is suspended") - continue - if uisp_suspended_strategy() == "slow": - print("WARNING: Site " + name + " is suspended") - download = 1 - upload = 1 - if site['identification']['status'] == "disconnected": - print("WARNING: Site " + name + " is disconnected") node = NetworkNode(id=id, displayName=name, type=NodeType.client, download=download, upload=upload, address=address, customerName=customerName) net.addRawNode(node) diff --git a/src/ispConfig.example.py b/src/ispConfig.example.py index 298bfe97..53220bd2 100644 --- a/src/ispConfig.example.py +++ b/src/ispConfig.example.py @@ -130,7 +130,7 @@ uispStrategy = "full" # Handling of UISP suspensions: # * "none" - do not handle suspensions # * "ignore" - do not add suspended customers to the network map -# * "slow" - limit suspended customers to 1 Mbps +# * "slow" - limit suspended customers to 1mbps uispSuspendedStrategy = "none" # Assumed capacity of AirMax and LTU radios vs reported capacity by UISP. For example, 65% would be 0.65. # For AirMax, this applies to flexible frame only. AirMax fixed frame will have capacity based on ratio.