mirror.MikroTik/tomaae.homeassistant-mikrotik_router
1
0
Fork 0
mirror of https://github.com/tomaae/homeassistant-mikrotik_router.git synced 2025-07-15 03:44:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

separated dhcp-network data point

Browse source
This commit is contained in:
tomaae 2020-04-13 06:55:08 +02:00
parent d84493a9b4
commit db1e92b29f
1 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

48
custom_components/mikrotik_router/mikrotik_controller.py
View file

@ -361,6 +361,7 @@ class MikrotikControllerData:
await self.hass.async_add_executor_job(self.get_bridge) await self.hass.async_add_executor_job(self.get_bridge)
await self.hass.async_add_executor_job(self.get_arp) await self.hass.async_add_executor_job(self.get_arp)
await self.hass.async_add_executor_job(self.get_dns) await self.hass.async_add_executor_job(self.get_dns)
await self.hass.async_add_executor_job(self.get_dhcp_network)
await self.hass.async_add_executor_job(self.get_dhcp) await self.hass.async_add_executor_job(self.get_dhcp)
await self.async_process_host() await self.async_process_host()
await self.hass.async_add_executor_job(self.get_interface_traffic) await self.hass.async_add_executor_job(self.get_interface_traffic)
@ -788,27 +789,6 @@ class MikrotikControllerData:
# --------------------------- # ---------------------------
def get_dhcp(self): def get_dhcp(self):
"""Get DHCP data from Mikrotik""" """Get DHCP data from Mikrotik"""
# TODO: run only on demand
self.data["dhcp-network"] = parse_api(
data=self.data["dhcp-network"],
source=self.api.path("/ip/dhcp-server/network"),
key="address",
vals=[
{"name": "address"},
{"name": "gateway", "default": ""},
{"name": "netmask", "default": ""},
{"name": "dns-server", "default": ""},
{"name": "domain", "default": ""},
],
ensure_vals=[{"name": "address"}, {"name": "IPv4Network", "default": ""},],
)
for uid, vals in self.data["dhcp-network"].items():
if vals["IPv4Network"] == "":
self.data["dhcp-network"][uid]["IPv4Network"] = IPv4Network(
vals["address"]
)
self.data["dhcp"] = parse_api( self.data["dhcp"] = parse_api(
data=self.data["dhcp"], data=self.data["dhcp"],
source=self.api.path("/ip/dhcp-server/lease"), source=self.api.path("/ip/dhcp-server/lease"),
@ -850,6 +830,32 @@ class MikrotikControllerData:
"interface" "interface"
] ]
# ---------------------------
# get_dhcp_network
# ---------------------------
def get_dhcp_network(self):
"""Get DHCP data from Mikrotik"""
# TODO: run only on demand
self.data["dhcp-network"] = parse_api(
data=self.data["dhcp-network"],
source=self.api.path("/ip/dhcp-server/network"),
key="address",
vals=[
{"name": "address"},
{"name": "gateway", "default": ""},
{"name": "netmask", "default": ""},
{"name": "dns-server", "default": ""},
{"name": "domain", "default": ""},
],
ensure_vals=[{"name": "address"}, {"name": "IPv4Network", "default": ""},],
)
for uid, vals in self.data["dhcp-network"].items():
if vals["IPv4Network"] == "":
self.data["dhcp-network"][uid]["IPv4Network"] = IPv4Network(
vals["address"]
)
# --------------------------- # ---------------------------
# get_capsman_hosts # get_capsman_hosts
# --------------------------- # ---------------------------