mirror.MikroTik/tomaae.homeassistant-mikrotik_router
1
0
Fork 0
mirror of https://github.com/tomaae/homeassistant-mikrotik_router.git synced 2025-08-20 17:28:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

moved update_bridge_hosts to separate function

Browse source
This commit is contained in:
tomaae 2019-12-02 03:33:49 +01:00
parent 3b5acc2393
commit b430acc11a
1 changed files with 40 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

22
custom_components/mikrotik_router/__init__.py
View file

@ -1,7 +1,5 @@
"""Mikrotik Router integration.""" """Mikrotik Router integration."""
from .mikrotikapi import MikrotikAPI
from datetime import timedelta from datetime import timedelta
import logging import logging
from homeassistant.exceptions import ConfigEntryNotReady from homeassistant.exceptions import ConfigEntryNotReady
@ -19,7 +17,7 @@ from .const import (
) )
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
from .mikrotikapi import MikrotikAPI
#DEFAULT_SCAN_INTERVAL = timedelta(seconds=DEFAULT_SCAN_INTERVAL) #DEFAULT_SCAN_INTERVAL = timedelta(seconds=DEFAULT_SCAN_INTERVAL)
@ -274,6 +272,19 @@ class MikrotikControllerData():
self.data['arp'][uid]['address'] = entry['address'] if 'address' in entry else "" self.data['arp'][uid]['address'] = entry['address'] if 'address' in entry else ""
if bridge_used: if bridge_used:
self.update_bridge_hosts()
## Map ARP to ifaces
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 ""
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 ""
return
#---------------------------
# update_bridge_hosts
#---------------------------
def update_bridge_hosts(self):
data = self.api.path("/interface/bridge/host") data = self.api.path("/interface/bridge/host")
for entry in data: for entry in data:
## Ignore port MAC ## Ignore port MAC
@ -306,11 +317,6 @@ class MikrotikControllerData():
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:
self.data['arp'][uid]['address'] = mac2ip[self.data['arp'][uid]['mac-address']] self.data['arp'][uid]['address'] = mac2ip[self.data['arp'][uid]['mac-address']]
## Map ARP to ifaces
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 ""
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 ""
return return
#--------------------------- #---------------------------