freifunk-franken
/
monitoring
mirror of https://github.com/FreifunkFranken/fff-monitoring.git
3
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #18 from kratz00/empty_mac 

Added workaround for empty 'mac_addr' element in nodewatcher data.
This commit is contained in:
Dominik Heidler 2016-05-16 17:03:24 +02:00
parent eca3c0b5d3 c42dc9b92f
commit 3bf3445c51
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ffmap/routertools.py
View File

@ -319,7 +319,6 @@ def parse_nodewatcher_xml(xml):
interface = {
"name": netif.xpath("name/text()")[0],
"mtu": int(netif.xpath("mtu/text()")[0]),
"mac": netif.xpath("mac_addr/text()")[0].lower(),
"traffic": {
"rx_bytes": int(netif.xpath("traffic_rx/text()")[0]),
"tx_bytes": int(netif.xpath("traffic_tx/text()")[0]),
@ -333,6 +332,10 @@ def parse_nodewatcher_xml(xml):
interface["ipv6_addrs"].append(ipv6_addr.lower().split("/")[0])
with suppress(IndexError):
interface["ipv4_addr"] = netif.xpath("ipv4_addr/text()")[0]
with suppress(IndexError):
interface["mac"] = ""
interface["mac"] = netif.xpath("mac_addr/text()")[0].lower()
router_update["netifs"].append(interface)
visible_neighbours = 0

3
ffmap/web/filters.py
View File

@ -117,6 +117,9 @@ def humanize_bytes(num, suffix='B'):
@filters.app_template_filter('mac2fe80')
def mac_to_ipv6_linklocal(mac):
if not mac:
return ''
# Remove the most common delimiters; dots, dashes, etc.
mac_bare = re.sub('[%s]+' % re.escape(' .:-'), '', mac)
mac_value = int(mac_bare, 16)