From df6351f86b50451c7ecd8e70cfb5bbc97829cc73 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Wed, 27 Oct 2021 12:44:47 +0200 Subject: [PATCH] Use DeviceInfo in shelly (#58520) Co-authored-by: epenet --- homeassistant/components/shelly/entity.py | 26 ++++++++--------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/homeassistant/components/shelly/entity.py b/homeassistant/components/shelly/entity.py index 0a610545180..e33a2d87317 100644 --- a/homeassistant/components/shelly/entity.py +++ b/homeassistant/components/shelly/entity.py @@ -282,6 +282,9 @@ class ShellyBlockEntity(entity.Entity): self.wrapper = wrapper self.block = block self._name = get_block_entity_name(wrapper.device, block) + self._attr_device_info = DeviceInfo( + connections={(device_registry.CONNECTION_NETWORK_MAC, wrapper.mac)} + ) @property def name(self) -> str: @@ -293,13 +296,6 @@ class ShellyBlockEntity(entity.Entity): """If device should be polled.""" return False - @property - def device_info(self) -> DeviceInfo: - """Device info.""" - return { - "connections": {(device_registry.CONNECTION_NETWORK_MAC, self.wrapper.mac)} - } - @property def available(self) -> bool: """Available.""" @@ -348,9 +344,9 @@ class ShellyRpcEntity(entity.Entity): self.wrapper = wrapper self.key = key self._attr_should_poll = False - self._attr_device_info = { - "connections": {(device_registry.CONNECTION_NETWORK_MAC, wrapper.mac)} - } + self._attr_device_info = DeviceInfo( + connections={(device_registry.CONNECTION_NETWORK_MAC, wrapper.mac)} + ) self._attr_unique_id = f"{wrapper.mac}-{key}" self._attr_name = get_rpc_entity_name(wrapper.device, key) @@ -494,19 +490,15 @@ class ShellyRestAttributeEntity(update_coordinator.CoordinatorEntity): self.description = description self._name = get_block_entity_name(wrapper.device, None, self.description.name) self._last_value = None + self._attr_device_info = DeviceInfo( + connections={(device_registry.CONNECTION_NETWORK_MAC, wrapper.mac)} + ) @property def name(self) -> str: """Name of sensor.""" return self._name - @property - def device_info(self) -> DeviceInfo: - """Device info.""" - return { - "connections": {(device_registry.CONNECTION_NETWORK_MAC, self.wrapper.mac)} - } - @property def entity_registry_enabled_default(self) -> bool: """Return if it should be enabled by default."""