mirror of
https://github.com/tomaae/homeassistant-mikrotik_router.git
synced 2025-07-24 12:34:31 +02:00
black formatting
This commit is contained in:
parent
41f9ad97c9
commit
966bdf2f57
4 changed files with 23 additions and 14 deletions
|
@ -391,10 +391,10 @@ class MikrotikControllerHostDeviceTracker(MikrotikControllerDeviceTracker):
|
||||||
"connections": {
|
"connections": {
|
||||||
(CONNECTION_NETWORK_MAC, self._data[self._sid_data["sid_ref"]])
|
(CONNECTION_NETWORK_MAC, self._data[self._sid_data["sid_ref"]])
|
||||||
},
|
},
|
||||||
#"manufacturer": self._ctrl.data["resource"]["platform"],
|
# "manufacturer": self._ctrl.data["resource"]["platform"],
|
||||||
#"model": self._ctrl.data["resource"]["board-name"],
|
# "model": self._ctrl.data["resource"]["board-name"],
|
||||||
"default_name": self._data[self._sid_data["sid_name"]],
|
"default_name": self._data[self._sid_data["sid_name"]],
|
||||||
}
|
}
|
||||||
if self._sid_data["sid"] == "interface":
|
if self._sid_data["sid"] == "interface":
|
||||||
info["name"] = f"{self._inst} {self._data[self._sid_data['sid_name']]}"
|
info["name"] = f"{self._inst} {self._data[self._sid_data['sid_name']]}"
|
||||||
return info
|
return info
|
||||||
|
|
|
@ -673,18 +673,24 @@ class MikrotikControllerData:
|
||||||
{"name": "routerboard", "type": "bool"},
|
{"name": "routerboard", "type": "bool"},
|
||||||
{"name": "model", "default": "unknown"},
|
{"name": "model", "default": "unknown"},
|
||||||
{"name": "serial-number", "default": "unknown"},
|
{"name": "serial-number", "default": "unknown"},
|
||||||
{"name": "firmware", "source": "current-firmware", "default": "unknown"},
|
{
|
||||||
|
"name": "firmware",
|
||||||
|
"source": "current-firmware",
|
||||||
|
"default": "unknown",
|
||||||
|
},
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
if self.data["routerboard"]["firmware"] != "unknown":
|
if self.data["routerboard"]["firmware"] != "unknown":
|
||||||
try:
|
try:
|
||||||
self.major_fw_version = int(self.data['routerboard'].get('firmware').split('.')[0])
|
self.major_fw_version = int(
|
||||||
|
self.data["routerboard"].get("firmware").split(".")[0]
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
_LOGGER.error(
|
_LOGGER.error(
|
||||||
"Mikrotik %s unable to determine major FW version (%s).",
|
"Mikrotik %s unable to determine major FW version (%s).",
|
||||||
self.host,
|
self.host,
|
||||||
self.data['routerboard'].get('firmware'),
|
self.data["routerboard"].get("firmware"),
|
||||||
)
|
)
|
||||||
|
|
||||||
# ---------------------------
|
# ---------------------------
|
||||||
|
|
|
@ -227,7 +227,9 @@ def update_items(inst, mikrotik_controller, async_add_entities, sensors):
|
||||||
new_sensors.append(sensors[item_id])
|
new_sensors.append(sensors[item_id])
|
||||||
|
|
||||||
for uid in mikrotik_controller.data["environment"]:
|
for uid in mikrotik_controller.data["environment"]:
|
||||||
item_id = f"{inst}-{sensor}-{mikrotik_controller.data['environment'][uid]['name']}"
|
item_id = (
|
||||||
|
f"{inst}-{sensor}-{mikrotik_controller.data['environment'][uid]['name']}"
|
||||||
|
)
|
||||||
_LOGGER.debug("Updating sensor %s", item_id)
|
_LOGGER.debug("Updating sensor %s", item_id)
|
||||||
if item_id in sensors:
|
if item_id in sensors:
|
||||||
if sensors[item_id].enabled:
|
if sensors[item_id].enabled:
|
||||||
|
@ -414,7 +416,7 @@ class MikrotikAccountingSensor(MikrotikControllerSensor):
|
||||||
@property
|
@property
|
||||||
def available(self) -> bool:
|
def available(self) -> bool:
|
||||||
"""Return if controller and accounting feature in Mikrotik is available.
|
"""Return if controller and accounting feature in Mikrotik is available.
|
||||||
Additional check for lan-tx/rx sensors
|
Additional check for lan-tx/rx sensors
|
||||||
"""
|
"""
|
||||||
if self._attr in ["lan-tx", "lan-rx"]:
|
if self._attr in ["lan-tx", "lan-rx"]:
|
||||||
return (
|
return (
|
||||||
|
@ -430,8 +432,8 @@ class MikrotikAccountingSensor(MikrotikControllerSensor):
|
||||||
"""Return a accounting description for device registry."""
|
"""Return a accounting description for device registry."""
|
||||||
info = {
|
info = {
|
||||||
"connections": {(CONNECTION_NETWORK_MAC, self._data["mac-address"])},
|
"connections": {(CONNECTION_NETWORK_MAC, self._data["mac-address"])},
|
||||||
#"manufacturer": self._ctrl.data["resource"]["platform"],
|
# "manufacturer": self._ctrl.data["resource"]["platform"],
|
||||||
#"model": self._ctrl.data["resource"]["board-name"],
|
# "model": self._ctrl.data["resource"]["board-name"],
|
||||||
"default_name": self._data["host-name"],
|
"default_name": self._data["host-name"],
|
||||||
}
|
}
|
||||||
return info
|
return info
|
||||||
|
@ -456,6 +458,7 @@ class MikrotikAccountingSensor(MikrotikControllerSensor):
|
||||||
self._sensor,
|
self._sensor,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------
|
# ---------------------------
|
||||||
# MikrotikControllerEnvironmentSensor
|
# MikrotikControllerEnvironmentSensor
|
||||||
# ---------------------------
|
# ---------------------------
|
||||||
|
@ -466,7 +469,7 @@ class MikrotikControllerEnvironmentSensor(MikrotikControllerSensor):
|
||||||
"""Initialize."""
|
"""Initialize."""
|
||||||
super().__init__(mikrotik_controller, inst, sensor)
|
super().__init__(mikrotik_controller, inst, sensor)
|
||||||
self._uid = uid
|
self._uid = uid
|
||||||
self._data = mikrotik_controller.data['environment'][uid]
|
self._data = mikrotik_controller.data["environment"][uid]
|
||||||
self._attr = "value"
|
self._attr = "value"
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -523,6 +526,6 @@ class MikrotikControllerEnvironmentSensor(MikrotikControllerSensor):
|
||||||
_LOGGER.debug(
|
_LOGGER.debug(
|
||||||
"New sensor %s (%s %s)",
|
"New sensor %s (%s %s)",
|
||||||
self._inst,
|
self._inst,
|
||||||
self._data['name'],
|
self._data["name"],
|
||||||
self._sensor,
|
self._sensor,
|
||||||
)
|
)
|
||||||
|
|
|
@ -287,13 +287,13 @@ class MikrotikControllerPortSwitch(MikrotikControllerSwitch):
|
||||||
mod_value = True
|
mod_value = True
|
||||||
self._ctrl.set_value(path, param, value, mod_param, mod_value)
|
self._ctrl.set_value(path, param, value, mod_param, mod_value)
|
||||||
|
|
||||||
|
|
||||||
if self._data["poe-out"] == "auto-on":
|
if self._data["poe-out"] == "auto-on":
|
||||||
path = "/interface/ethernet"
|
path = "/interface/ethernet"
|
||||||
self._ctrl.set_value(path, param, value, "poe-out", "off")
|
self._ctrl.set_value(path, param, value, "poe-out", "off")
|
||||||
|
|
||||||
await self._ctrl.async_update()
|
await self._ctrl.async_update()
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------
|
# ---------------------------
|
||||||
# MikrotikControllerNATSwitch
|
# MikrotikControllerNATSwitch
|
||||||
# ---------------------------
|
# ---------------------------
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue