Merge branch 'long_term_stats' of https://github.com/LibreQoE/LibreQoS into long_term_stats

README.md

@@ -15,9 +15,9 @@ Learn more about [Equinix Metal here](https://deploy.equinix.com/metal/).
 
 Please support the continued development of LibreQoS by sponsoring us via [GitHub Sponsors](https://github.com/sponsors/LibreQoE) or [Patreon](https://patreon.com/libreqos).
 
-## Documentation
+## Documentation / Get Started
 
-[Docs](https://libreqos.readthedocs.io)
+[ReadTheDocs](https://libreqos.readthedocs.io/en/latest/)
 
 ## Matrix Chat
 
@@ -113,8 +113,5 @@ So for example, an ISP delivering 1Gbps service plans with 10Gbps aggregate thro
   * Known supported cards:
     * [NVIDIA Mellanox MCX512A-ACAT](https://www.fs.com/products/119649.html)
     * NVIDIA Mellanox MCX416A-CCAT
-    * [Intel X710](https://www.fs.com/products/75600.html)
+    * [Intel X710](https://www.fs.com/products/75600.html) * Note - possible i40e driver issue with XDP Redirect for high throughput 10G+
     * Intel X520
-    
-## Get Started
-- [ReadTheDocs](https://libreqos.readthedocs.io/en/develop/docs/SystemRequirements/Compute.html)

src/integrationUISP.py

@@ -22,6 +22,10 @@ try:
 	from ispConfig import ltu_capacity
 except:
 	ltu_capacity = 0.90
+try:
+	from ispConfig import usePtMPasParent
+except:
+	usePtMPasParent = False
 
 def uispRequest(target):
 	# Sends an HTTP request to UISP and returns the
@@ -341,8 +345,9 @@ def findNodesBranchedOffPtMP(siteList, dataLinks, sites, rootSite, foundAirFiber
 																			'upload': upload,
 																			parent: apID
 																			}
-																site['parent'] = apID
-																print('Site ' + name + ' will use PtMP AP as parent.')
+																if usePtMPasParent:
+																	site['parent'] = apID
+																	print('Site ' + name + ' will use PtMP AP as parent.')
 	return siteList, nodeOffPtMP
 
 def handleMultipleInternetNodes(sites, dataLinks, uispSite):
@@ -359,7 +364,7 @@ def handleMultipleInternetNodes(sites, dataLinks, uispSite):
 		uispSite = 'Internet'
 		for link in dataLinks:
 			if link['canDelete'] ==  False:
-				if link['from']['device']['identification']['id'] == link['to']['device']['identification']['id']:
+				if link['from']['device'] is not None and link['to']['device'] is not None and link['from']['device']['identification']['id'] == link['to']['device']['identification']['id']:
 					link['from']['site']['identification']['id'] = '001'
 					link['from']['site']['identification']['name'] = 'Internet'
 					# Found internet link