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

Use default_model and default_manufacturer

Browse source
This commit is contained in:
Michel van de Wetering 2022-03-23 14:04:14 +01:00
parent 67d8a66066
commit f20496b027
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
custom_components/mikrotik_router/binary_sensor.py
View file

@ -213,8 +213,8 @@ class MikrotikControllerBinarySensor(BinarySensorEntity):
connections={(dev_connection, f"{dev_connection_value}")}, connections={(dev_connection, f"{dev_connection_value}")},
identifiers={(dev_connection, f"{dev_connection_value}")}, identifiers={(dev_connection, f"{dev_connection_value}")},
default_name=f"{self._inst} {dev_group}", default_name=f"{self._inst} {dev_group}",
model=f"{self._ctrl.data['resource']['board-name']}", default_model=f"{self._ctrl.data['resource']['board-name']}",
manufacturer=f"{self._ctrl.data['resource']['platform']}", default_manufacturer=f"{self._ctrl.data['resource']['platform']}",
sw_version=f"{self._ctrl.data['resource']['version']}", sw_version=f"{self._ctrl.data['resource']['version']}",
configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}", configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}",
via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"), via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"),
@ -232,7 +232,7 @@ class MikrotikControllerBinarySensor(BinarySensorEntity):
info = DeviceInfo( info = DeviceInfo(
connections={(dev_connection, f"{dev_connection_value}")}, connections={(dev_connection, f"{dev_connection_value}")},
default_name=f"{dev_group}", default_name=f"{dev_group}",
manufacturer=f"{dev_manufacturer}", deafult_manufacturer=f"{dev_manufacturer}",
via_device=( via_device=(
DOMAIN, DOMAIN,
f"{self._ctrl.data['routerboard']['serial-number']}", f"{self._ctrl.data['routerboard']['serial-number']}",

12
custom_components/mikrotik_router/device_tracker.py
View file

@ -170,9 +170,9 @@ class MikrotikControllerDeviceTracker(ScannerEntity):
"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"], "default_manufacturer": self._ctrl.data["resource"]["platform"],
"model": self._ctrl.data["resource"]["board-name"], "default_model": self._ctrl.data["resource"]["board-name"],
"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']]}"
@ -208,8 +208,8 @@ class MikrotikControllerDeviceTracker(ScannerEntity):
connections={(dev_connection, f"{dev_connection_value}")}, connections={(dev_connection, f"{dev_connection_value}")},
identifiers={(dev_connection, f"{dev_connection_value}")}, identifiers={(dev_connection, f"{dev_connection_value}")},
default_name=f"{self._inst} {dev_group}", default_name=f"{self._inst} {dev_group}",
model=f"{self._ctrl.data['resource']['board-name']}", default_model=f"{self._ctrl.data['resource']['board-name']}",
manufacturer=f"{self._ctrl.data['resource']['platform']}", default_manufacturer=f"{self._ctrl.data['resource']['platform']}",
sw_version=f"{self._ctrl.data['resource']['version']}", sw_version=f"{self._ctrl.data['resource']['version']}",
configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}", configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}",
via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"), via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"),
@ -227,7 +227,7 @@ class MikrotikControllerDeviceTracker(ScannerEntity):
info = DeviceInfo( info = DeviceInfo(
connections={(dev_connection, f"{dev_connection_value}")}, connections={(dev_connection, f"{dev_connection_value}")},
default_name=f"{dev_group}", default_name=f"{dev_group}",
manufacturer=f"{dev_manufacturer}", default_manufacturer=f"{dev_manufacturer}",
via_device=( via_device=(
DOMAIN, DOMAIN,
f"{self._ctrl.data['routerboard']['serial-number']}", f"{self._ctrl.data['routerboard']['serial-number']}",

6
custom_components/mikrotik_router/sensor.py
View file

@ -255,8 +255,8 @@ class MikrotikControllerSensor(SensorEntity):
connections={(dev_connection, f"{dev_connection_value}")}, connections={(dev_connection, f"{dev_connection_value}")},
identifiers={(dev_connection, f"{dev_connection_value}")}, identifiers={(dev_connection, f"{dev_connection_value}")},
default_name=f"{self._inst} {dev_group}", default_name=f"{self._inst} {dev_group}",
model=f"{self._ctrl.data['resource']['board-name']}", default_model=f"{self._ctrl.data['resource']['board-name']}",
manufacturer=f"{self._ctrl.data['resource']['platform']}", deafult_manufacturer=f"{self._ctrl.data['resource']['platform']}",
sw_version=f"{self._ctrl.data['resource']['version']}", sw_version=f"{self._ctrl.data['resource']['version']}",
configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}", configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}",
via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"), via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"),
@ -274,7 +274,7 @@ class MikrotikControllerSensor(SensorEntity):
info = DeviceInfo( info = DeviceInfo(
connections={(dev_connection, f"{dev_connection_value}")}, connections={(dev_connection, f"{dev_connection_value}")},
default_name=f"{dev_group}", default_name=f"{dev_group}",
manufacturer=f"{dev_manufacturer}", default_manufacturer=f"{dev_manufacturer}",
via_device=( via_device=(
DOMAIN, DOMAIN,
f"{self._ctrl.data['routerboard']['serial-number']}", f"{self._ctrl.data['routerboard']['serial-number']}",

4
custom_components/mikrotik_router/switch.py
View file

@ -212,8 +212,8 @@ class MikrotikControllerSwitch(SwitchEntity, RestoreEntity):
connections={(dev_connection, f"{dev_connection_value}")}, connections={(dev_connection, f"{dev_connection_value}")},
identifiers={(dev_connection, f"{dev_connection_value}")}, identifiers={(dev_connection, f"{dev_connection_value}")},
default_name=f"{self._inst} {dev_group}", default_name=f"{self._inst} {dev_group}",
model=f"{self._ctrl.data['resource']['board-name']}", default_model=f"{self._ctrl.data['resource']['board-name']}",
manufacturer=f"{self._ctrl.data['resource']['platform']}", default_manufacturer=f"{self._ctrl.data['resource']['platform']}",
sw_version=f"{self._ctrl.data['resource']['version']}", sw_version=f"{self._ctrl.data['resource']['version']}",
configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}", configuration_url=f"http://{self._ctrl.config_entry.data[CONF_HOST]}",
via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"), via_device=(DOMAIN, f"{self._ctrl.data['routerboard']['serial-number']}"),