From 825e696d2688398f2b9c8c53db1ed3eff0d1d91c Mon Sep 17 00:00:00 2001 From: Aaron Bach Date: Sat, 9 Jul 2022 08:42:32 -0600 Subject: [PATCH] Migrate Guardian to new entity naming style (#74745) --- homeassistant/components/guardian/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/guardian/__init__.py b/homeassistant/components/guardian/__init__.py index 25e0df913d8..ba4bc5e6ad6 100644 --- a/homeassistant/components/guardian/__init__.py +++ b/homeassistant/components/guardian/__init__.py @@ -373,11 +373,12 @@ class PairedSensorManager: class GuardianEntity(CoordinatorEntity): """Define a base Guardian entity.""" + _attr_has_entity_name = True + def __init__( # pylint: disable=super-init-not-called self, entry: ConfigEntry, description: EntityDescription ) -> None: """Initialize.""" - self._attr_device_info = DeviceInfo(manufacturer="Elexa") self._attr_extra_state_attributes = {} self._entry = entry self.entity_description = description @@ -406,12 +407,11 @@ class PairedSensorEntity(GuardianEntity): paired_sensor_uid = coordinator.data["uid"] self._attr_device_info = DeviceInfo( identifiers={(DOMAIN, paired_sensor_uid)}, + manufacturer="Elexa", + model=coordinator.data["codename"], name=f"Guardian Paired Sensor {paired_sensor_uid}", via_device=(DOMAIN, entry.data[CONF_UID]), ) - self._attr_name = ( - f"Guardian Paired Sensor {paired_sensor_uid}: {description.name}" - ) self._attr_unique_id = f"{paired_sensor_uid}_{description.key}" self.coordinator = coordinator @@ -434,10 +434,10 @@ class ValveControllerEntity(GuardianEntity): self._attr_device_info = DeviceInfo( identifiers={(DOMAIN, entry.data[CONF_UID])}, + manufacturer="Elexa", model=coordinators[API_SYSTEM_DIAGNOSTICS].data["firmware"], name=f"Guardian Valve Controller {entry.data[CONF_UID]}", ) - self._attr_name = f"Guardian {entry.data[CONF_UID]}: {description.name}" self._attr_unique_id = f"{entry.data[CONF_UID]}_{description.key}" self.coordinators = coordinators