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

black

Browse source
This commit is contained in:
tomaae 2020-04-12 08:49:34 +02:00
parent a5361b37bb
commit 362f700ec4
1 changed files with 9 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

39
custom_components/mikrotik_router/mikrotik_controller.py
View file

@ -312,7 +312,7 @@ class MikrotikControllerData:
] = await self.hass.async_add_executor_job( ] = await self.hass.async_add_executor_job(
self.api_ping.arp_ping, self.api_ping.arp_ping,
self.data["host"][uid]["address"], self.data["host"][uid]["address"],
self.data["host"][uid]["interface"] self.data["host"][uid]["interface"],
) )
# Update last seen # Update last seen
@ -458,9 +458,7 @@ class MikrotikControllerData:
"reverse": True, "reverse": True,
}, },
], ],
only=[ only=[{"key": "local", "value": False}],
{"key": "local", "value": False}
],
) )
for uid, vals in self.data["bridge_host"].items(): for uid, vals in self.data["bridge_host"].items():
@ -537,9 +535,7 @@ class MikrotikControllerData:
{"key": "dst-port"}, {"key": "dst-port"},
] ]
], ],
only=[ only=[{"key": "action", "value": "dst-nat"}],
{"key": "action", "value": "dst-nat"}
],
) )
# Remove duplicate NAT entries to prevent crash # Remove duplicate NAT entries to prevent crash
@ -758,14 +754,8 @@ class MikrotikControllerData:
data=self.data["arp"], data=self.data["arp"],
source=self.api.path("/ip/arp"), source=self.api.path("/ip/arp"),
key="mac-address", key="mac-address",
vals=[ vals=[{"name": "mac-address"}, {"name": "address"}, {"name": "interface"},],
{"name": "mac-address"}, ensure_vals=[{"name": "bridge", "default": ""},],
{"name": "address"},
{"name": "interface"},
],
ensure_vals=[
{"name": "bridge", "default": ""},
],
) )
for uid, vals in self.data["arp"].items(): for uid, vals in self.data["arp"].items():
@ -788,10 +778,7 @@ class MikrotikControllerData:
data=self.data["dns"], data=self.data["dns"],
source=self.api.path("/ip/dns/static"), source=self.api.path("/ip/dns/static"),
key="name", key="name",
vals=[ vals=[{"name": "name"}, {"name": "address"},],
{"name": "name"},
{"name": "address"},
],
) )
# --------------------------- # ---------------------------
@ -811,10 +798,7 @@ class MikrotikControllerData:
{"name": "dns-server", "default": ""}, {"name": "dns-server", "default": ""},
{"name": "domain", "default": ""}, {"name": "domain", "default": ""},
], ],
ensure_vals=[ ensure_vals=[{"name": "address"}, {"name": "IPv4Network", "default": ""},],
{"name": "address"},
{"name": "IPv4Network", "default": ""},
],
) )
for uid, vals in self.data["dhcp-network"].items(): for uid, vals in self.data["dhcp-network"].items():
@ -828,10 +812,7 @@ class MikrotikControllerData:
data=self.data["dhcp-server"], data=self.data["dhcp-server"],
source=self.api.path("/ip/dhcp-server"), source=self.api.path("/ip/dhcp-server"),
key="name", key="name",
vals=[ vals=[{"name": "name"}, {"name": "interface", "default": ""},],
{"name": "name"},
{"name": "interface", "default": ""},
],
) )
self.data["dhcp"] = parse_api( self.data["dhcp"] = parse_api(
@ -847,9 +828,7 @@ class MikrotikControllerData:
{"name": "server", "default": "unknown"}, {"name": "server", "default": "unknown"},
{"name": "comment", "default": ""}, {"name": "comment", "default": ""},
], ],
ensure_vals=[ ensure_vals=[{"name": "interface"},],
{"name": "interface"},
],
) )
for uid in self.data["dhcp"]: for uid in self.data["dhcp"]: