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

Initialize wan/lan accounting data on startup

Browse source
This commit is contained in:
Ivan Pavlina 2020-04-05 16:00:30 +02:00
parent f9a458bbfb
commit a1eee6f698
1 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

29
custom_components/mikrotik_router/mikrotik_controller.py
View file

@ -688,16 +688,7 @@ class MikrotikControllerData:
] ]
) )
# Also retrieve static DNS entries
dns_data = parse_api(
data={},
source=self.api.path("/ip/dns/static", return_list=True),
key="address",
vals=[
{"name": "address"},
{"name": "name"},
],
)
# Also retrieve all entries in ARP table. If some hosts are missing, build it here # Also retrieve all entries in ARP table. If some hosts are missing, build it here
arp_hosts = parse_api( arp_hosts = parse_api(
@ -729,6 +720,17 @@ class MikrotikControllerData:
# Build name for host. First try getting DHCP lease comment, then entry in DNS and then device's host-name. # Build name for host. First try getting DHCP lease comment, then entry in DNS and then device's host-name.
# If everything fails use hosts IP address as name # If everything fails use hosts IP address as name
dns_data = parse_api(
data={},
source=self.api.path("/ip/dns/static", return_list=True),
key="address",
vals=[
{"name": "address"},
{"name": "name"},
],
)
for addr in self.data["accounting"]: for addr in self.data["accounting"]:
if str(self.data["accounting"][addr].get('comment', '').strip()): if str(self.data["accounting"][addr].get('comment', '').strip()):
self.data["accounting"][addr]['name'] = self.data["accounting"][addr]['comment'] self.data["accounting"][addr]['name'] = self.data["accounting"][addr]['comment']
@ -739,6 +741,13 @@ class MikrotikControllerData:
else: else:
self.data["accounting"][addr]['name'] = self.data["accounting"][addr]['address'] self.data["accounting"][addr]['name'] = self.data["accounting"][addr]['address']
# Initialize data
self.data["accounting"][addr]["wan-tx"] = 0
self.data["accounting"][addr]["wan-rx"] = 0
if self.account_local_traffic:
self.data["accounting"][addr]["lan-tx"] = 0
self.data["accounting"][addr]["lan-rx"] = 0
_LOGGER.debug(f"Generated {len(self.data['accounting'])} accounting hosts") _LOGGER.debug(f"Generated {len(self.data['accounting'])} accounting hosts")
# Build local networks # Build local networks