Remove attributes from Nuki entities (#125348)

* Remove attributes from Nuki entities * remove tests
home-assistant · Sep 6, 2024 · f8c94fd · f8c94fd
1 parent 9777ed2
commit f8c94fd
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 48 deletions.
diff --git a/homeassistant/components/nuki/binary_sensor.py b/homeassistant/components/nuki/binary_sensor.py
@@ -15,7 +15,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import NukiEntity, NukiEntryData
-from .const import ATTR_NUKI_ID, DOMAIN as NUKI_DOMAIN
+from .const import DOMAIN as NUKI_DOMAIN
 
 
 async def async_setup_entry(
@@ -51,14 +51,6 @@ def unique_id(self) -> str:
         """Return a unique ID."""
         return f"{self._nuki_device.nuki_id}_doorsensor"
 
-    # Deprecated, can be removed in 2024.10
-    @property
-    def extra_state_attributes(self):
-        """Return the device specific state attributes."""
-        return {
-            ATTR_NUKI_ID: self._nuki_device.nuki_id,
-        }
-
     @property
     def available(self) -> bool:
         """Return true if door sensor is present and activated."""
@@ -91,14 +83,6 @@ def unique_id(self) -> str:
         """Return a unique ID."""
         return f"{self._nuki_device.nuki_id}_ringaction"
 
-    # Deprecated, can be removed in 2024.10
-    @property
-    def extra_state_attributes(self):
-        """Return the device specific state attributes."""
-        return {
-            ATTR_NUKI_ID: self._nuki_device.nuki_id,
-        }
-
     @property
     def is_on(self) -> bool:
         """Return the value of the ring action state."""

diff --git a/homeassistant/components/nuki/lock.py b/homeassistant/components/nuki/lock.py
@@ -18,14 +18,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import NukiEntity, NukiEntryData
-from .const import (
-    ATTR_BATTERY_CRITICAL,
-    ATTR_ENABLE,
-    ATTR_NUKI_ID,
-    ATTR_UNLATCH,
-    DOMAIN as NUKI_DOMAIN,
-    ERROR_STATES,
-)
+from .const import ATTR_ENABLE, ATTR_UNLATCH, DOMAIN as NUKI_DOMAIN, ERROR_STATES
 from .helpers import CannotConnect
 
 
@@ -75,15 +68,6 @@ def unique_id(self) -> str | None:
         """Return a unique ID."""
         return self._nuki_device.nuki_id
 
-    # Deprecated, can be removed in 2024.10
-    @property
-    def extra_state_attributes(self) -> dict[str, Any]:
-        """Return the device specific state attributes."""
-        return {
-            ATTR_BATTERY_CRITICAL: self._nuki_device.battery_critical,
-            ATTR_NUKI_ID: self._nuki_device.nuki_id,
-        }
-
     @property
     def available(self) -> bool:
         """Return True if entity is available."""

diff --git a/homeassistant/components/nuki/sensor.py b/homeassistant/components/nuki/sensor.py
@@ -11,7 +11,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import NukiEntity, NukiEntryData
-from .const import ATTR_NUKI_ID, DOMAIN as NUKI_DOMAIN
+from .const import DOMAIN as NUKI_DOMAIN
 
 
 async def async_setup_entry(
@@ -38,12 +38,6 @@ def unique_id(self) -> str:
         """Return a unique ID."""
         return f"{self._nuki_device.nuki_id}_battery_level"
 
-    # Deprecated, can be removed in 2024.10
-    @property
-    def extra_state_attributes(self):
-        """Return the device specific state attributes."""
-        return {ATTR_NUKI_ID: self._nuki_device.nuki_id}
-
     @property
     def native_value(self) -> float:
         """Return the state of the sensor."""

diff --git a/tests/components/nuki/snapshots/test_binary_sensor.ambr b/tests/components/nuki/snapshots/test_binary_sensor.ambr
@@ -83,7 +83,6 @@
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'friendly_name': 'Community door Ring Action',
-      'nuki_id': 2,
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.community_door_ring_action',
@@ -131,7 +130,6 @@
     'attributes': ReadOnlyDict({
       'device_class': 'door',
       'friendly_name': 'Home',
-      'nuki_id': 1,
     }),
     'context': <ANY>,
     'entity_id': 'binary_sensor.home',

diff --git a/tests/components/nuki/snapshots/test_lock.ambr b/tests/components/nuki/snapshots/test_lock.ambr
@@ -35,9 +35,7 @@
 # name: test_locks[lock.community_door-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'battery_critical': False,
       'friendly_name': 'Community door',
-      'nuki_id': 2,
       'supported_features': <LockEntityFeature: 1>,
     }),
     'context': <ANY>,
@@ -84,9 +82,7 @@
 # name: test_locks[lock.home-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
-      'battery_critical': False,
       'friendly_name': 'Home',
-      'nuki_id': 1,
       'supported_features': <LockEntityFeature: 1>,
     }),
     'context': <ANY>,

diff --git a/tests/components/nuki/snapshots/test_sensor.ambr b/tests/components/nuki/snapshots/test_sensor.ambr
@@ -37,7 +37,6 @@
     'attributes': ReadOnlyDict({
       'device_class': 'battery',
       'friendly_name': 'Home Battery',
-      'nuki_id': 1,
       'unit_of_measurement': '%',
     }),
     'context': <ANY>,