freifunk/node_hierarchy
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Wokring on support for hopglass server (raw.json).

Browse source
This commit is contained in:
Simon Wüllhorst 2017-04-23 23:09:31 +02:00
commit 1a01718538
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
parser/Hopglass.py
View file

@ -8,6 +8,8 @@ class Hopglass(JsonParser):
self.ifIDs = {}
self.links = collections.defaultdict(dict)
self.nodes = {}
self.gatewayMacs = []
self.gateways = []
self.__aggregateData__()
#print(self.ifIDs)
for k, v in self.links.items():
@ -17,11 +19,12 @@ class Hopglass(JsonParser):
for nodeID, nodeData in self.__jsonData__.items():
# let pass nodes that provide all required informations only
if not set(('nodeinfo', 'neighbours')) <= set(nodeData):
if not set(('nodeinfo', 'neighbours', 'statistics')) <= set(nodeData):
continue
nodeInfo = nodeData['nodeinfo']
neighbours = nodeData['neighbours']
statistics = nodeData['statistics']
if not 'batadv' in neighbours:
continue
@ -29,6 +32,9 @@ class Hopglass(JsonParser):
if not 'mesh' in nodeInfo.get('network', {}):
continue
if statistics.get('gateway', False):
self.gatewayMacs.append(statistics['gateway'])
for batID, batVal in nodeInfo['network']['mesh'].items():
if not 'interfaces' in batVal:
continue
@ -42,9 +48,13 @@ class Hopglass(JsonParser):
self.nodes[nodeID] = nodeData
for nodeID, nodeData in self.nodes.items():
nodeData['nodeinfo']['isGateway'] = False
nodeData['nodeinfo']['isOnline'] = True # Todo: implement detection
for iname, ivalue in nodeData['neighbours']['batadv'].items():
if 'neighbours' not in ivalue:
continue
if iname in self.gatewayMacs:
nodeData['nodeinfo']['isGateway'] = True
if not iname in self.ifIDs:
continue
for nname, nvalue in ivalue['neighbours'].items():