From 48965264b6d5a2c39d53d542104f1a50f34390bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Sun, 17 Mar 2024 08:51:08 -0600 Subject: [PATCH 1/5] Update integrationUISP.py --- src/integrationUISP.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/integrationUISP.py b/src/integrationUISP.py index fa1b8dd2..046f7f73 100644 --- a/src/integrationUISP.py +++ b/src/integrationUISP.py @@ -65,6 +65,16 @@ 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) From b06d6af7bf4694f74b7c228de2fd88574bcda226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Sun, 17 Mar 2024 08:55:04 -0600 Subject: [PATCH 2/5] Update integrationUISP.py --- src/integrationUISP.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/integrationUISP.py b/src/integrationUISP.py index 046f7f73..37c14602 100644 --- a/src/integrationUISP.py +++ b/src/integrationUISP.py @@ -71,8 +71,8 @@ def buildFlatGraph(): continue if uisp_suspended_strategy() == "slow": print("WARNING: Site " + name + " is suspended") - download = 1 - upload = 1 + download = 2 + upload = 2 if site['identification']['status'] == "disconnected": print("WARNING: Site " + name + " is disconnected") @@ -484,8 +484,8 @@ def buildFullGraph(): continue if uispSuspendedStrategy == "slow": print("WARNING: Site " + name + " is suspended") - download = 1 - upload = 1 + download = 2 + upload = 2 if site['identification']['status'] == "disconnected": print("WARNING: Site " + name + " is disconnected") From 9a3b3719f727d7d369dead78f9a2f669aa95a733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Sun, 17 Mar 2024 09:02:13 -0600 Subject: [PATCH 3/5] Update ispConfig.example.py --- src/ispConfig.example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ispConfig.example.py b/src/ispConfig.example.py index 53220bd2..7bf9f4ec 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 1mbps +# * "slow" - limit suspended customers to 2 Mbps 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. From 4dfad7a7b3e2e366462f35fbd67a720a8771a675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Sun, 24 Mar 2024 10:51:25 -0600 Subject: [PATCH 4/5] Update integrationUISP.py --- src/integrationUISP.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/integrationUISP.py b/src/integrationUISP.py index 37c14602..046f7f73 100644 --- a/src/integrationUISP.py +++ b/src/integrationUISP.py @@ -71,8 +71,8 @@ def buildFlatGraph(): continue if uisp_suspended_strategy() == "slow": print("WARNING: Site " + name + " is suspended") - download = 2 - upload = 2 + download = 1 + upload = 1 if site['identification']['status'] == "disconnected": print("WARNING: Site " + name + " is disconnected") @@ -484,8 +484,8 @@ def buildFullGraph(): continue if uispSuspendedStrategy == "slow": print("WARNING: Site " + name + " is suspended") - download = 2 - upload = 2 + download = 1 + upload = 1 if site['identification']['status'] == "disconnected": print("WARNING: Site " + name + " is disconnected") From d66d5ddaded932c29aeebb52d7d467e2991dc0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Chac=C3=B3n?= Date: Sun, 24 Mar 2024 10:52:49 -0600 Subject: [PATCH 5/5] Update ispConfig.example.py --- src/ispConfig.example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ispConfig.example.py b/src/ispConfig.example.py index 7bf9f4ec..298bfe97 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 2 Mbps +# * "slow" - limit suspended customers to 1 Mbps 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.