diff --git a/homeassistant/components/abode/__init__.py b/homeassistant/components/abode/__init__.py index 38e88944867..2b7e2a07467 100644 --- a/homeassistant/components/abode/__init__.py +++ b/homeassistant/components/abode/__init__.py @@ -287,14 +287,14 @@ class AbodeDevice(AbodeEntity): """Initialize Abode device.""" super().__init__(data) self._device = device - self._attr_unique_id = device.device_uuid + self._attr_unique_id = device.uuid async def async_added_to_hass(self) -> None: """Subscribe to device events.""" await super().async_added_to_hass() await self.hass.async_add_executor_job( self._data.abode.events.add_device_callback, - self._device.device_id, + self._device.id, self._update_callback, ) @@ -302,7 +302,7 @@ class AbodeDevice(AbodeEntity): """Unsubscribe from device events.""" await super().async_will_remove_from_hass() await self.hass.async_add_executor_job( - self._data.abode.events.remove_all_device_callbacks, self._device.device_id + self._data.abode.events.remove_all_device_callbacks, self._device.id ) def update(self) -> None: @@ -313,7 +313,7 @@ class AbodeDevice(AbodeEntity): def extra_state_attributes(self) -> dict[str, str]: """Return the state attributes.""" return { - "device_id": self._device.device_id, + "device_id": self._device.id, "battery_low": self._device.battery_low, "no_response": self._device.no_response, "device_type": self._device.type, @@ -323,7 +323,7 @@ class AbodeDevice(AbodeEntity): def device_info(self) -> entity.DeviceInfo: """Return device registry information for this entity.""" return entity.DeviceInfo( - identifiers={(DOMAIN, self._device.device_id)}, + identifiers={(DOMAIN, self._device.id)}, manufacturer="Abode", model=self._device.type, name=self._device.name, diff --git a/homeassistant/components/abode/alarm_control_panel.py b/homeassistant/components/abode/alarm_control_panel.py index 66a2e3b0db5..d0137395446 100644 --- a/homeassistant/components/abode/alarm_control_panel.py +++ b/homeassistant/components/abode/alarm_control_panel.py @@ -69,7 +69,7 @@ class AbodeAlarm(AbodeDevice, alarm.AlarmControlPanelEntity): def extra_state_attributes(self) -> dict[str, str]: """Return the state attributes.""" return { - "device_id": self._device.device_id, + "device_id": self._device.id, "battery_backup": self._device.battery, "cellular_backup": self._device.is_cellular, } diff --git a/homeassistant/components/abode/sensor.py b/homeassistant/components/abode/sensor.py index 1e238783221..bf885485fc3 100644 --- a/homeassistant/components/abode/sensor.py +++ b/homeassistant/components/abode/sensor.py @@ -63,7 +63,7 @@ class AbodeSensor(AbodeDevice, SensorEntity): """Initialize a sensor for an Abode device.""" super().__init__(data, device) self.entity_description = description - self._attr_unique_id = f"{device.device_uuid}-{description.key}" + self._attr_unique_id = f"{device.uuid}-{description.key}" if description.key == CONST.TEMP_STATUS_KEY: self._attr_native_unit_of_measurement = device.temp_unit elif description.key == CONST.HUMI_STATUS_KEY: