IntenseWebs/LibreQoS
3
0
Fork 0
mirror of https://github.com/LibreQoE/LibreQoS.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #320 from vettagroup/vettacontrib

Browse Source 
Fix replaceRootNote and circuit stats priorQuery
This commit is contained in:
Robert Chacón
2023-03-30 18:21:26 -06:00
committed by GitHub
parent 3e7c00272b 80a442724d
commit 41b86b6a87
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
old/v1.3/integrationCommon.py
View File

@@ -134,7 +134,7 @@ class NetworkGraph:
node.parentId = self.exceptionCPEs[node.displayName]
self.nodes.append(node)
def replaceRootNote(self, node: NetworkNode) -> None:
def replaceRootNode(self, node: NetworkNode) -> None:
# Replaces the automatically generated root node
# with a new node. Useful when you have a top-level
# node specified (e.g. "uispSite" in the UISP

2
old/v1.3/integrationUISP.py
View File

@@ -145,7 +145,7 @@ def buildFullGraph():
# If this is the uispSite node, it becomes the root. Otherwise, add it to the
# node soup.
if name == uispSite:
net.replaceRootNote(node)
net.replaceRootNode(node)
else:
net.addRawNode(node)

2
old/v1.3/testGraph.py
View File

@@ -53,7 +53,7 @@ class TestGraph(unittest.TestCase):
from integrationCommon import NetworkGraph, NetworkNode, NodeType
graph = NetworkGraph()
node = NetworkNode("Test", type = NodeType.site)
graph.replaceRootNote(node)
graph.replaceRootNode(node)
self.assertEqual(graph.nodes[0].id, "Test")
def add_child_by_named_parent(self):

2
src/graphInfluxDB.py
View File

@@ -331,7 +331,7 @@ def getCircuitLatencyStats(subscriberCircuits):
# If we can't identify RTT this time around, use most recently recorded RTT
# None by default, change if found in priorQuery
circuit['stats']['sinceLastQuery']['tcpLatency'] = None
if circuit['stats']['priorQuery'] != None:
if 'priorQuery' in circuit['stats'] and circuit['stats']['priorQuery'] != None:
if 'priorQuery' in circuit['stats']:
if 'tcpLatency' in circuit['stats']['priorQuery']:
circuit['stats']['sinceLastQuery']['tcpLatency'] = circuit['stats']['priorQuery']['tcpLatency']

2
src/integrationCommon.py
View File

@@ -135,7 +135,7 @@ class NetworkGraph:
node.parentId = self.exceptionCPEs[node.displayName]
self.nodes.append(node)
def replaceRootNote(self, node: NetworkNode) -> None:
def replaceRootNode(self, node: NetworkNode) -> None:
# Replaces the automatically generated root node
# with a new node. Useful when you have a top-level
# node specified (e.g. "uispSite" in the UISP

2
src/integrationUISP.py
View File

@@ -176,7 +176,7 @@ def buildFullGraph():
# If this is the uispSite node, it becomes the root. Otherwise, add it to the
# node soup.
if name == uispSite:
net.replaceRootNote(node)
net.replaceRootNode(node)
else:
net.addRawNode(node)

2
src/testGraph.py
View File

@@ -53,7 +53,7 @@ class TestGraph(unittest.TestCase):
from integrationCommon import NetworkGraph, NetworkNode, NodeType
graph = NetworkGraph()
node = NetworkNode("Test", type = NodeType.site)
graph.replaceRootNote(node)
graph.replaceRootNode(node)
self.assertEqual(graph.nodes[0].id, "Test")
def add_child_by_named_parent(self):