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

always update tracked host data from parent source #180

Browse source
This commit is contained in:
Tomaae 2022-05-18 21:28:53 +02:00
parent 5bef491779
commit 0da0f876c3
No known key found for this signature in database
GPG key ID: 8360BBD8A381D1C0
1 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

44
custom_components/mikrotik_router/mikrotik_controller.py
View file

@ -1795,18 +1795,15 @@ class MikrotikControllerData:
if self.support_capsman: if self.support_capsman:
for uid, vals in self.data["capsman_hosts"].items(): for uid, vals in self.data["capsman_hosts"].items():
if uid not in self.data["host"]: if uid not in self.data["host"]:
self.data["host"][uid] = {} self.data["host"][uid] = {"source": "capsman"}
elif self.data["host"][uid]["source"] != "capsman":
continue
self.data["host"][uid]["source"] = "capsman"
capsman_detected[uid] = True capsman_detected[uid] = True
self.data["host"][uid]["available"] = True self.data["host"][uid]["available"] = True
self.data["host"][uid]["last-seen"] = utcnow() self.data["host"][uid]["last-seen"] = utcnow()
for key in ["mac-address", "interface"]: for key in ["mac-address", "interface"]:
if ( self.data["host"][uid][key] = vals[key]
key not in self.data["host"][uid]
or self.data["host"][uid][key] == "unknown"
):
self.data["host"][uid][key] = vals[key]
# Add hosts from wireless # Add hosts from wireless
wireless_detected = {} wireless_detected = {}
@ -1816,40 +1813,35 @@ class MikrotikControllerData:
continue continue
if uid not in self.data["host"]: if uid not in self.data["host"]:
self.data["host"][uid] = {} self.data["host"][uid] = {"source": "wireless"}
elif self.data["host"][uid]["source"] != "wireless":
continue
self.data["host"][uid]["source"] = "wireless"
wireless_detected[uid] = True wireless_detected[uid] = True
self.data["host"][uid]["available"] = True self.data["host"][uid]["available"] = True
self.data["host"][uid]["last-seen"] = utcnow() self.data["host"][uid]["last-seen"] = utcnow()
for key in ["mac-address", "interface"]: for key in ["mac-address", "interface"]:
if ( self.data["host"][uid][key] = vals[key]
key not in self.data["host"][uid]
or self.data["host"][uid][key] == "unknown"
):
self.data["host"][uid][key] = vals[key]
# Add hosts from DHCP # Add hosts from DHCP
for uid, vals in self.data["dhcp"].items(): for uid, vals in self.data["dhcp"].items():
if uid not in self.data["host"]: if uid not in self.data["host"]:
self.data["host"][uid] = {"source": "dhcp"} self.data["host"][uid] = {"source": "dhcp"}
for key in ["address", "mac-address", "interface"]: elif self.data["host"][uid]["source"] != "dhcp":
if ( continue
key not in self.data["host"][uid]
or self.data["host"][uid][key] == "unknown" for key in ["address", "mac-address", "interface"]:
): self.data["host"][uid][key] = vals[key]
self.data["host"][uid][key] = vals[key]
# Add hosts from ARP # Add hosts from ARP
for uid, vals in self.data["arp"].items(): for uid, vals in self.data["arp"].items():
if uid not in self.data["host"]: if uid not in self.data["host"]:
self.data["host"][uid] = {"source": "arp"} self.data["host"][uid] = {"source": "arp"}
for key in ["address", "mac-address", "interface"]: elif self.data["host"][uid]["source"] != "arp":
if ( continue
key not in self.data["host"][uid]
or self.data["host"][uid][key] == "unknown" for key in ["address", "mac-address", "interface"]:
): self.data["host"][uid][key] = vals[key]
self.data["host"][uid][key] = vals[key]
# Add restored hosts from hass registry # Add restored hosts from hass registry
if not self.host_hass_recovered: if not self.host_hass_recovered: