Do not update IP or hostname from disabled DHCP entry #265

This commit is contained in:
Tomaae 2023-01-20 09:35:59 +01:00
parent a7c00d8fb3
commit ce9ce906f5
No known key found for this signature in database
GPG key ID: 2F97770867DAA4E6

View file

@ -2179,7 +2179,11 @@ class MikrotikControllerData:
self.data["host"][uid]["available"] = False self.data["host"][uid]["available"] = False
# Update IP and interface (DHCP/returned host) # Update IP and interface (DHCP/returned host)
if uid in self.data["dhcp"] and "." in self.data["dhcp"][uid]["address"]: if (
uid in self.data["dhcp"]
and self.data["dhcp"][uid]["enabled"]
and "." in self.data["dhcp"][uid]["address"]
):
if ( if (
self.data["dhcp"][uid]["address"] self.data["dhcp"][uid]["address"]
!= self.data["host"][uid]["address"] != self.data["host"][uid]["address"]
@ -2217,6 +2221,7 @@ class MikrotikControllerData:
].split("#", 1)[0] ].split("#", 1)[0]
elif ( elif (
uid in self.data["dhcp"] uid in self.data["dhcp"]
and self.data["dhcp"][uid]["enabled"]
and self.data["dhcp"][uid]["comment"].split("#", 1)[0] and self.data["dhcp"][uid]["comment"].split("#", 1)[0]
!= "" != ""
): ):
@ -2234,6 +2239,7 @@ class MikrotikControllerData:
if ( if (
self.data["host"][uid]["host-name"] == "unknown" self.data["host"][uid]["host-name"] == "unknown"
and uid in self.data["dhcp"] and uid in self.data["dhcp"]
and self.data["dhcp"][uid]["enabled"]
and self.data["dhcp"][uid]["comment"].split("#", 1)[0] != "" and self.data["dhcp"][uid]["comment"].split("#", 1)[0] != ""
): ):
self.data["host"][uid]["host-name"] = self.data["dhcp"][uid][ self.data["host"][uid]["host-name"] = self.data["dhcp"][uid][
@ -2243,6 +2249,7 @@ class MikrotikControllerData:
elif ( elif (
self.data["host"][uid]["host-name"] == "unknown" self.data["host"][uid]["host-name"] == "unknown"
and uid in self.data["dhcp"] and uid in self.data["dhcp"]
and self.data["dhcp"][uid]["enabled"]
and self.data["dhcp"][uid]["host-name"] != "unknown" and self.data["dhcp"][uid]["host-name"] != "unknown"
): ):
self.data["host"][uid]["host-name"] = self.data["dhcp"][uid][ self.data["host"][uid]["host-name"] = self.data["dhcp"][uid][