clean up handle_cluster_handler_attribute_updated

zha/application/platforms/cover/__init__.py

@@ -7,6 +7,7 @@
 import logging
 from typing import TYPE_CHECKING, Any, cast
 
+from zigpy.zcl.clusters.general import OnOff
 from zigpy.zcl.foundation import Status
 
 from zha.application import Platform
@@ -394,8 +395,9 @@ def handle_cluster_handler_attribute_updated(
         self, event: ClusterAttributeUpdatedEvent
     ) -> None:
         """Set open/closed state."""
-        self._is_open = bool(event.attribute_value)
-        self.maybe_emit_state_changed_event()
+        if event.attribute_id == OnOff.AttributeDefs.on_off.id:
+            self._is_open = bool(event.attribute_value)
+            self.maybe_emit_state_changed_event()
 
     def handle_cluster_handler_set_level(self, event: LevelChangeEvent) -> None:
         """Set the reported position."""

zha/application/platforms/device_tracker.py

@@ -7,6 +7,8 @@
 import time
 from typing import TYPE_CHECKING
 
+from zigpy.zcl.clusters.general import PowerConfiguration
+
 from zha.application import Platform
 from zha.application.platforms import PlatformEntity
 from zha.application.platforms.sensor import Battery
@@ -111,7 +113,10 @@ def handle_cluster_handler_attribute_updated(
         self, event: ClusterAttributeUpdatedEvent
     ) -> None:
         """Handle tracking."""
-        if event.attribute_name != "battery_percentage_remaining":
+        if (
+            event.attribute_name
+            != PowerConfiguration.AttributeDefs.battery_percentage_remaining.name
+        ):
             return
         self.debug("battery_percentage_remaining updated: %s", event.attribute_value)
         self._connected = True

zha/application/platforms/light/__init__.py

@@ -856,6 +856,11 @@ def handle_cluster_handler_attribute_updated(
         self, event: ClusterAttributeUpdatedEvent
     ) -> None:
         """Set the state."""
+        if (
+            event.cluster_id != self._on_off_cluster_handler.cluster.cluster_id
+            or event.attribute_id != OnOff.AttributeDefs.on_off.id
+        ):
+            return
         if self.is_transitioning:
             self.debug(
                 "received onoff %s while transitioning - skipping update",

zha/application/platforms/lock/__init__.py

@@ -5,6 +5,7 @@
 import functools
 from typing import TYPE_CHECKING, Any
 
+from zigpy.zcl.clusters.closures import DoorLock as DoorLockCluster
 from zigpy.zcl.foundation import Status
 
 from zha.application import Platform
@@ -111,6 +112,8 @@ def handle_cluster_handler_attribute_updated(
         self, event: ClusterAttributeUpdatedEvent
     ) -> None:
         """Handle state update from cluster handler."""
+        if event.attribute_id != DoorLockCluster.AttributeDefs.lock_state.id:
+            return
         self._state = VALUE_TO_STATE.get(event.attribute_value, self._state)
         self.maybe_emit_state_changed_event()
 

zha/application/platforms/switch.py

@@ -114,7 +114,8 @@ def handle_cluster_handler_attribute_updated(
         event: ClusterAttributeUpdatedEvent,  # pylint: disable=unused-argument
     ) -> None:
         """Handle state update from cluster handler."""
-        self.maybe_emit_state_changed_event()
+        if event.attribute_name == OnOff.AttributeDefs.on_off.name:
+            self.maybe_emit_state_changed_event()
 
 
 @GROUP_MATCH()

zha/zigbee/cluster_handlers/__init__.py

@@ -129,6 +129,7 @@ class ClusterAttributeUpdatedEvent:
     attribute_name: str
     attribute_value: Any
     cluster_handler_unique_id: str
+    cluster_id: int
     event_type: Final[str] = CLUSTER_HANDLER_EVENT
     event: Final[str] = CLUSTER_HANDLER_ATTRIBUTE_UPDATED
 
@@ -465,6 +466,7 @@ def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
                 attribute_name=attr_name,
                 attribute_value=value,
                 cluster_handler_unique_id=self.unique_id,
+                cluster_id=self.cluster.cluster_id,
             ),
         )
 

zha/zigbee/cluster_handlers/closures.py

@@ -45,6 +45,7 @@ async def async_update(self):
                     attribute_name=DoorLock.AttributeDefs.lock_state.name,
                     attribute_value=result,
                     cluster_handler_unique_id=self.unique_id,
+                    cluster_id=self.cluster.cluster_id,
                 ),
             )
 
@@ -83,6 +84,7 @@ def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
                     attribute_name=attr_name,
                     attribute_value=value,
                     cluster_handler_unique_id=self.unique_id,
+                    cluster_id=self.cluster.cluster_id,
                 ),
             )
 

zha/zigbee/cluster_handlers/general.py

@@ -524,6 +524,7 @@ def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
                     attribute_name=OnOff.AttributeDefs.on_off.name,
                     attribute_value=value,
                     cluster_handler_unique_id=self.unique_id,
+                    cluster_id=self.cluster.cluster_id,
                 ),
             )
 

zha/zigbee/cluster_handlers/hvac.py

@@ -84,6 +84,7 @@ def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
                     attribute_name=attr_name,
                     attribute_value=value,
                     cluster_handler_unique_id=self.unique_id,
+                    cluster_id=self.cluster.cluster_id,
                 ),
             )
 
@@ -304,6 +305,7 @@ def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
                 attribute_name=attr_name,
                 attribute_value=value,
                 cluster_handler_unique_id=self.unique_id,
+                cluster_id=self.cluster.cluster_id,
             ),
         )
 

zha/zigbee/cluster_handlers/manufacturerspecific.py

@@ -224,6 +224,7 @@ def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
                     attribute_name=attr_name,
                     attribute_value=value,
                     cluster_handler_unique_id=self.unique_id,
+                    cluster_id=self.cluster.cluster_id,
                 ),
             )
             return

zha/zigbee/cluster_handlers/security.py

@@ -413,6 +413,7 @@ def attribute_updated(self, attrid: int, value: Any, _: Any) -> None:
                     attribute_name=IasZone.AttributeDefs.zone_status.name,
                     attribute_value=value,
                     cluster_handler_unique_id=self.unique_id,
+                    cluster_id=self.cluster.cluster_id,
                 ),
             )