mirror.MikroTik/tomaae.homeassistant-mikrotik_router
1
0
Fork 0
mirror of https://github.com/tomaae/homeassistant-mikrotik_router.git synced 2025-06-26 18:58:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

code cleanup

Browse source 
fixed typo in get_firmare_update
This commit is contained in:
tomaae 2019-12-09 00:31:43 +01:00
parent 6ff53266f0
commit c49e81a208
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
custom_components/mikrotik_router/mikrotik_controller.py
View file

@ -278,8 +278,11 @@ class MikrotikControllerData():
# Map ARP to ifaces # Map ARP to ifaces
for uid in self.data['interface']: for uid in self.data['interface']:
self.data['interface'][uid]['client-ip-address'] = self.data['arp'][uid]['address'] if uid in self.data['arp'] and 'address' in self.data['arp'][uid] else "" if uid not in self.data['arp']:
self.data['interface'][uid]['client-mac-address'] = self.data['arp'][uid]['mac-address'] if uid in self.data['arp'] and 'mac-address' in self.data['arp'][uid] else "" continue
self.data['interface'][uid]['client-ip-address'] = from_entry(self.data['arp'][uid], 'address')
self.data['interface'][uid]['client-mac-address'] = from_entry(self.data['arp'][uid], 'mac-address')
return True return True
@ -317,8 +320,9 @@ class MikrotikControllerData():
# Add data # Add data
self.data['arp'][uid]['interface'] = uid self.data['arp'][uid]['interface'] = uid
self.data['arp'][uid]['mac-address'] = "multiple" if 'mac-address' in self.data['arp'][uid] else entry['mac-address'] self.data['arp'][uid]['mac-address'] = from_entry(entry, 'mac-address') if 'mac-address' not in self.data['arp'][uid] else "multiple"
self.data['arp'][uid]['address'] = "multiple" if 'address' in self.data['arp'][uid] else entry['address'] self.data['arp'][uid]['address'] = from_entry(entry, 'address') if 'address' not in self.data['arp'][uid] else "multiple"
return mac2ip, bridge_used return mac2ip, bridge_used
# --------------------------- # ---------------------------
@ -350,7 +354,7 @@ class MikrotikControllerData():
self.data['arp'][uid]['mac-address'] = "multiple" self.data['arp'][uid]['mac-address'] = "multiple"
self.data['arp'][uid]['address'] = "multiple" self.data['arp'][uid]['address'] = "multiple"
else: else:
self.data['arp'][uid]['mac-address'] = entry['mac-address'] self.data['arp'][uid]['mac-address'] = from_entry(entry, 'mac-address')
self.data['arp'][uid]['address'] = "" self.data['arp'][uid]['address'] = ""
if self.data['arp'][uid]['address'] == "" and self.data['arp'][uid]['mac-address'] in mac2ip: if self.data['arp'][uid]['address'] == "" and self.data['arp'][uid]['mac-address'] in mac2ip:
@ -454,7 +458,7 @@ class MikrotikControllerData():
return return
for entry in data: for entry in data:
if 'entry' in entry: if 'status' in entry:
self.data['fw-update']['available'] = True if entry['status'] == "New version is available" else False self.data['fw-update']['available'] = True if entry['status'] == "New version is available" else False
elif 'available' not in self.data['fw-update']: elif 'available' not in self.data['fw-update']:
self.data['fw-update']['available'] = False self.data['fw-update']['available'] = False