Fixed broken merge

This commit is contained in:
Ivan Pavlina 2020-04-08 16:31:26 +02:00
parent f141c6915b
commit 1bb90d51cd

View file

@ -750,7 +750,7 @@ class MikrotikControllerData:
{"name": "status", "default": "unknown"},
{"name": "last-seen", "default": "unknown"},
{"name": "server", "default": "unknown"},
{"name": "comment"},
{"name": "comment", "default": ""},
],
ensure_vals=[
{"name": "interface"},
@ -831,14 +831,6 @@ class MikrotikControllerData:
if self.data["host"][uid]["available"]:
self.data["host"][uid]["last-seen"] = utcnow()
# Update interface and availability for hosts present in DHCP leases
if uid in self.data["dhcp"]:
self.data["dhcp"][uid]['interface'] = \
self.data["dhcp-server"][self.data["dhcp"][uid]['server']]["interface"]
self.data["dhcp"][uid]['available'] = \
self.api.arp_ping(self.data["dhcp"][uid]['address'], self.data["dhcp"][uid]['interface'])
def _address_part_of_local_network(self, address):
address = ip_address(address)
for vals in self.data["dhcp-network"].values():