diff options
author | Nils Schneider <nils@nilsschneider.net> | 2014-02-02 23:28:09 +0100 |
---|---|---|
committer | Nils Schneider <nils@nilsschneider.net> | 2014-02-02 23:30:16 +0100 |
commit | 914836eb9a777d0dbde7bf015b5715dad5fefb15 (patch) | |
tree | d6ac1cc40081429635f467b24eae5863430ba700 | |
parent | bd19e5f18ccefff3eee9fabe656956d3ece9adda (diff) |
alfred.py: pass firmware version to nodes.json
-rwxr-xr-x | alfred.py | 6 | ||||
-rw-r--r-- | d3mapbuilder.py | 1 | ||||
-rw-r--r-- | node.py | 1 | ||||
-rw-r--r-- | nodedb.py | 3 |
4 files changed, 11 insertions, 0 deletions
@@ -14,6 +14,12 @@ class alfred: node_alias = {} if 'location' in node: node_alias['gps'] = str(node['location']['latitude']) + ' ' + str(node['location']['longitude']) + + try: + node_alias['firmware'] = node['software']['firmware']['release'] + except KeyError: + pass + if 'hostname' in node: node_alias['name'] = node['hostname'] elif 'name' in node: diff --git a/d3mapbuilder.py b/d3mapbuilder.py index 0d824be..3daf1ee 100644 --- a/d3mapbuilder.py +++ b/d3mapbuilder.py @@ -15,6 +15,7 @@ class D3MapBuilder: output['nodes'] = [{'name': x.name, 'id': x.id, 'macs': ', '.join(x.macs), 'geo': [float(x) for x in x.gps.split(" ")] if x.gps else None, + 'firmware': x.firmware, 'flags': x.flags } for x in nodes] @@ -10,6 +10,7 @@ class Node(): "client": False }) self.gps = None + self.firmware = None def add_mac(self, mac): mac = mac.lower() @@ -185,6 +185,9 @@ class NodeDB: if 'gps' in alias: node.gps = alias['gps'] + if 'firmware' in alias: + node.firmware = alias['firmware'] + # list of macs # if options['gateway']: # mark_gateways(options['gateway']) |