From 41f9ad97c9102a047c821b0d35af87c18045aa8b Mon Sep 17 00:00:00 2001 From: tomaae <23486452+tomaae@users.noreply.github.com> Date: Wed, 2 Dec 2020 14:57:30 +0100 Subject: [PATCH] Device tracker and accounting sensor uses default_name and does not add manufacturer and model data #57 --- .../mikrotik_router/device_tracker.py | 15 +++++++++++++++ custom_components/mikrotik_router/sensor.py | 6 +++--- hacs.json | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/custom_components/mikrotik_router/device_tracker.py b/custom_components/mikrotik_router/device_tracker.py index 8fdfa6d..256c7dd 100644 --- a/custom_components/mikrotik_router/device_tracker.py +++ b/custom_components/mikrotik_router/device_tracker.py @@ -383,3 +383,18 @@ class MikrotikControllerHostDeviceTracker(MikrotikControllerDeviceTracker): attributes[format_attribute(variable)] = self._data[variable] return attributes + + @property + def device_info(self): + """Return a description for device registry.""" + info = { + "connections": { + (CONNECTION_NETWORK_MAC, self._data[self._sid_data["sid_ref"]]) + }, + #"manufacturer": self._ctrl.data["resource"]["platform"], + #"model": self._ctrl.data["resource"]["board-name"], + "default_name": self._data[self._sid_data["sid_name"]], + } + if self._sid_data["sid"] == "interface": + info["name"] = f"{self._inst} {self._data[self._sid_data['sid_name']]}" + return info \ No newline at end of file diff --git a/custom_components/mikrotik_router/sensor.py b/custom_components/mikrotik_router/sensor.py index 4ccce84..c0f6e1f 100644 --- a/custom_components/mikrotik_router/sensor.py +++ b/custom_components/mikrotik_router/sensor.py @@ -430,9 +430,9 @@ class MikrotikAccountingSensor(MikrotikControllerSensor): """Return a accounting description for device registry.""" info = { "connections": {(CONNECTION_NETWORK_MAC, self._data["mac-address"])}, - "manufacturer": self._ctrl.data["resource"]["platform"], - "model": self._ctrl.data["resource"]["board-name"], - "name": self._data["host-name"], + #"manufacturer": self._ctrl.data["resource"]["platform"], + #"model": self._ctrl.data["resource"]["board-name"], + "default_name": self._data["host-name"], } return info diff --git a/hacs.json b/hacs.json index 2c8e40b..cf799fd 100644 --- a/hacs.json +++ b/hacs.json @@ -1,6 +1,6 @@ { "name": "Mikrotik Router", - "homeassistant": "0.110.0", + "homeassistant": "0.114.0", "iot_class": "local_poll", "domains": ["device_tracker", "switch", "sensor", "binary_sensor"], "render_readme": false,