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

Format serial number #161

Browse source
This commit is contained in:
Tomaae 2022-01-21 15:50:25 +01:00
parent 1bc901cf9d
commit 8f7202d418
5 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
custom_components/mikrotik_router/__init__.py
View file

@ -78,7 +78,7 @@ async def async_setup_entry(hass, config_entry):
device_registry = await hass.helpers.device_registry.async_get_registry() device_registry = await hass.helpers.device_registry.async_get_registry()
device_registry.async_get_or_create( device_registry.async_get_or_create(
config_entry_id=config_entry.entry_id, config_entry_id=config_entry.entry_id,
connections={(DOMAIN, controller.data["routerboard"]["serial-number"])}, connections={(DOMAIN, f"{controller.data['routerboard']['serial-number']}")},
manufacturer=controller.data["resource"]["platform"], manufacturer=controller.data["resource"]["platform"],
model=controller.data["routerboard"]["model"], model=controller.data["routerboard"]["model"],
name=f"{config_entry.data[CONF_NAME]} {controller.data['routerboard']['model']}", name=f"{config_entry.data[CONF_NAME]} {controller.data['routerboard']['model']}",
@ -87,7 +87,7 @@ async def async_setup_entry(hass, config_entry):
identifiers={ identifiers={
DOMAIN, DOMAIN,
"serial-number", "serial-number",
controller.data["routerboard"]["serial-number"], f"{controller.data['routerboard']['serial-number']}",
"sensor", "sensor",
f"{config_entry.data[CONF_NAME]} {controller.data['routerboard']['model']}", f"{config_entry.data[CONF_NAME]} {controller.data['routerboard']['model']}",
}, },

8
custom_components/mikrotik_router/binary_sensor.py
View file

@ -306,7 +306,9 @@ class MikrotikControllerBinarySensor(BinarySensorEntity):
self._type[ATTR_GROUP] = self._ctrl.data["resource"]["board-name"] self._type[ATTR_GROUP] = self._ctrl.data["resource"]["board-name"]
info = { info = {
"connections": {(DOMAIN, self._ctrl.data["routerboard"]["serial-number"])}, "connections": {
(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}")
},
"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"],
"name": f"{self._inst} {self._type[ATTR_GROUP]}", "name": f"{self._inst} {self._type[ATTR_GROUP]}",
@ -318,7 +320,7 @@ class MikrotikControllerBinarySensor(BinarySensorEntity):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"sensor", "sensor",
f"{self._inst} {self._type[ATTR_GROUP]}", f"{self._inst} {self._type[ATTR_GROUP]}",
) )
@ -418,7 +420,7 @@ class MikrotikControllerPPPSecretBinarySensor(MikrotikControllerBinarySensor):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"switch", "switch",
"PPP", "PPP",
) )

2
custom_components/mikrotik_router/button.py
View file

@ -199,7 +199,7 @@ class MikrotikControllerScriptButton(MikrotikControllerButton):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"button", "button",
"Scripts", "Scripts",
) )

8
custom_components/mikrotik_router/sensor.py
View file

@ -463,7 +463,9 @@ class MikrotikControllerSensor(SensorEntity):
self._type[ATTR_GROUP] = self._ctrl.data["resource"]["board-name"] self._type[ATTR_GROUP] = self._ctrl.data["resource"]["board-name"]
info = { info = {
"connections": {(DOMAIN, self._ctrl.data["routerboard"]["serial-number"])}, "connections": {
(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}")
},
"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"],
"name": f"{self._inst} {self._type[ATTR_GROUP]}", "name": f"{self._inst} {self._type[ATTR_GROUP]}",
@ -475,7 +477,7 @@ class MikrotikControllerSensor(SensorEntity):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"sensor", "sensor",
f"{self._inst} {self._type[ATTR_GROUP]}", f"{self._inst} {self._type[ATTR_GROUP]}",
) )
@ -631,7 +633,7 @@ class MikrotikControllerEnvironmentSensor(MikrotikControllerSensor):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"sensor", "sensor",
"Environment", "Environment",
) )

14
custom_components/mikrotik_router/switch.py
View file

@ -510,7 +510,7 @@ class MikrotikControllerNATSwitch(MikrotikControllerSwitch):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"switch", "switch",
"NAT", "NAT",
) )
@ -599,7 +599,7 @@ class MikrotikControllerMangleSwitch(MikrotikControllerSwitch):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"switch", "switch",
"Mangle", "Mangle",
) )
@ -688,7 +688,7 @@ class MikrotikControllerFilterSwitch(MikrotikControllerSwitch):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"switch", "switch",
"Filter", "Filter",
) )
@ -774,7 +774,7 @@ class MikrotikControllerPPPSecretSwitch(MikrotikControllerSwitch):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"switch", "switch",
"PPP", "PPP",
) )
@ -834,7 +834,7 @@ class MikrotikControllerQueueSwitch(MikrotikControllerSwitch):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"switch", "switch",
"Queue", "Queue",
) )
@ -902,7 +902,7 @@ class MikrotikControllerKidcontrolSwitch(MikrotikControllerSwitch):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"switch", "switch",
"Kidcontrol", "Kidcontrol",
) )
@ -977,7 +977,7 @@ class MikrotikControllerKidcontrolPauseSwitch(MikrotikControllerSwitch):
( (
DOMAIN, DOMAIN,
"serial-number", "serial-number",
self._ctrl.data["routerboard"]["serial-number"], f"{self._ctrl.data['routerboard']['serial-number']}",
"switch", "switch",
"Kidcontrol", "Kidcontrol",
) )