jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 21:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Continue tracking device over dhcp lease table if wireless adapter not installed (#7690)

Browse Source
This commit is contained in:
LvivEchoes 2017-05-22 03:18:55 +03:00 committed by Paulus Schoutsen
parent bb8de5845a
commit 99ea1e3f4f
1 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
homeassistant/components/device_tracker/mikrotik.py
View File

@ -60,13 +60,20 @@ class MikrotikScanner(DeviceScanner):
self.success_init = False self.success_init = False
self.client = None self.client = None
self.wireless_exist = None
self.success_init = self.connect_to_device() self.success_init = self.connect_to_device()
if self.success_init: if self.success_init:
_LOGGER.info("Start polling Mikrotik router...") _LOGGER.info(
"Start polling Mikrotik (%s) router...",
self.host
)
self._update_info() self._update_info()
else: else:
_LOGGER.error("Connection to Mikrotik failed") _LOGGER.error(
"Connection to Mikrotik (%s) failed",
self.host
)
def connect_to_device(self): def connect_to_device(self):
"""Connect to Mikrotik method.""" """Connect to Mikrotik method."""
@ -87,6 +94,16 @@ class MikrotikScanner(DeviceScanner):
routerboard_info[0].get('model', 'Router'), routerboard_info[0].get('model', 'Router'),
self.host) self.host)
self.connected = True self.connected = True
self.wireless_exist = self.client(
cmd='/interface/wireless/getall'
)
if not self.wireless_exist:
_LOGGER.info(
'Mikrotik %s: Wireless adapters not found. Try to '
'use DHCP lease table as presence tracker source. '
'Please decrease lease time as much as possible.',
self.host
)
except (librouteros.exceptions.TrapError, except (librouteros.exceptions.TrapError,
librouteros.exceptions.ConnectionError) as api_error: librouteros.exceptions.ConnectionError) as api_error:
@ -108,24 +125,39 @@ class MikrotikScanner(DeviceScanner):
def _update_info(self): def _update_info(self):
"""Retrieve latest information from the Mikrotik box.""" """Retrieve latest information from the Mikrotik box."""
with self.lock: with self.lock:
_LOGGER.info("Loading wireless device from Mikrotik...") if self.wireless_exist:
devices_tracker = 'wireless'
else:
devices_tracker = 'ip'
wireless_clients = self.client( _LOGGER.info(
cmd='/interface/wireless/registration-table/getall' "Loading %s devices from Mikrotik (%s) ...",
devices_tracker,
self.host
) )
device_names = self.client(cmd='/ip/dhcp-server/lease/getall')
if device_names is None or wireless_clients is None: device_names = self.client(cmd='/ip/dhcp-server/lease/getall')
if self.wireless_exist:
devices = self.client(
cmd='/interface/wireless/registration-table/getall'
)
else:
devices = device_names
if device_names is None and devices is None:
return False return False
mac_names = {device.get('mac-address'): device.get('host-name') mac_names = {device.get('mac-address'): device.get('host-name')
for device in device_names for device in device_names
if device.get('mac-address')} if device.get('mac-address')}
self.last_results = { if self.wireless_exist:
device.get('mac-address'): self.last_results = {
mac_names.get(device.get('mac-address')) device.get('mac-address'):
for device in wireless_clients mac_names.get(device.get('mac-address'))
} for device in devices
}
else:
self.last_results = mac_names
return True return True