From 1bb90d51cd0c06b3c8f509858ad767616d66ecef Mon Sep 17 00:00:00 2001 From: Ivan Pavlina Date: Wed, 8 Apr 2020 16:31:26 +0200 Subject: [PATCH] Fixed broken merge --- .../mikrotik_router/mikrotik_controller.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/custom_components/mikrotik_router/mikrotik_controller.py b/custom_components/mikrotik_router/mikrotik_controller.py index 751550e..3a57697 100644 --- a/custom_components/mikrotik_router/mikrotik_controller.py +++ b/custom_components/mikrotik_router/mikrotik_controller.py @@ -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():