IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2024-11-26 02:00:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update integrationUISP.py

Browse Source
This commit is contained in:
Robert Chacón 2023-11-13 21:27:06 -07:00 committed by GitHub
parent 9f829b55c8
commit 7ed0f6fdac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/integrationUISP.py
View File

@ -328,26 +328,25 @@ def findNodesBranchedOffPtMP(siteList, dataLinks, sites, rootSite, foundAirFiber
parent = site['parent'] parent = site['parent']
for link in dataLinks: for link in dataLinks:
if (link['to']['site'] is not None) and (link['to']['site']['identification'] is not None): if (link['to']['site'] is not None) and (link['to']['site']['identification'] is not None):
if ('identification' in link['to']['site']) and (link['to']['site']['identification'] is not None): if ('identification' in link['to']['site']) and (link['to']['site']['identification'] is not None) and link['from'] is not None and link['from']['site'] is not None and link['from']['site']['identification'] is not None:
if ('identification' in link['from']['site']) and (link['from']['site']['identification'] is not None): # Respect parent defined by topology and overrides
# Respect parent defined by topology and overrides if link['from']['site']['identification']['id'] == trueParent:
if link['from']['site']['identification']['id'] == trueParent: if link['to']['site']['identification']['id'] == id:
if link['to']['site']['identification']['id'] == id: if (link['from']['device']['overview']['wirelessMode'] == 'ap-ptmp') or (link['from']['device']['overview']['wirelessMode'] == 'ap'):
if (link['from']['device']['overview']['wirelessMode'] == 'ap-ptmp') or (link['from']['device']['overview']['wirelessMode'] == 'ap'): if 'overview' in link['to']['device']:
if 'overview' in link['to']['device']: if ('downlinkCapacity' in link['to']['device']['overview']) and ('uplinkCapacity' in link['to']['device']['overview']):
if ('downlinkCapacity' in link['to']['device']['overview']) and ('uplinkCapacity' in link['to']['device']['overview']): if (link['to']['device']['overview']['downlinkCapacity'] is not None) and (link['to']['device']['overview']['uplinkCapacity'] is not None):
if (link['to']['device']['overview']['downlinkCapacity'] is not None) and (link['to']['device']['overview']['uplinkCapacity'] is not None): apID = link['from']['device']['identification']['id']
apID = link['from']['device']['identification']['id'] # Capacity of the PtMP client radio feeding the PoP will be used as the site bandwidth limit
# Capacity of the PtMP client radio feeding the PoP will be used as the site bandwidth limit download = int(round(link['to']['device']['overview']['downlinkCapacity']/1000000))
download = int(round(link['to']['device']['overview']['downlinkCapacity']/1000000)) upload = int(round(link['to']['device']['overview']['uplinkCapacity']/1000000))
upload = int(round(link['to']['device']['overview']['uplinkCapacity']/1000000)) nodeOffPtMP[id] = {'download': download,
nodeOffPtMP[id] = {'download': download, 'upload': upload,
'upload': upload, parent: apID
parent: apID }
} if usePtMPasParent:
if usePtMPasParent: site['parent'] = apID
site['parent'] = apID print('Site ' + name + ' will use PtMP AP as parent.')
print('Site ' + name + ' will use PtMP AP as parent.')
return siteList, nodeOffPtMP return siteList, nodeOffPtMP
def handleMultipleInternetNodes(sites, dataLinks, uispSite): def handleMultipleInternetNodes(sites, dataLinks, uispSite):