Clusters are matched on name, so ensure names suffixed by client

Author: elupus

tests/data/devices/lumi-lumi-remote-cagl02.json

@@ -440,20 +440,6 @@
           "enabled": true,
           "primary": false,
           "cluster_handlers": [
-            {
-              "class_name": "OtaClusterHandler",
-              "generic_id": "cluster_handler_0x0019",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 25,
-                "name": "Ota",
-                "type": "server"
-              },
-              "id": "1:0x0019",
-              "unique_id": "54:ef:44:10:00:14:f3:e7:1:0x0019",
-              "status": "INITIALIZED",
-              "value_attribute": null
-            },
             {
               "class_name": "OtaClientClusterHandler",
               "generic_id": "cluster_handler_0x0019_client",

tests/data/devices/lumi-lumi-sensor-86sw2.json

@@ -587,20 +587,6 @@
           "enabled": true,
           "primary": false,
           "cluster_handlers": [
-            {
-              "class_name": "OtaClusterHandler",
-              "generic_id": "cluster_handler_0x0019",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 25,
-                "name": "Ota",
-                "type": "server"
-              },
-              "id": "1:0x0019",
-              "unique_id": "00:15:8d:00:02:54:cb:fa:1:0x0019",
-              "status": "INITIALIZED",
-              "value_attribute": null
-            },
             {
               "class_name": "OtaClientClusterHandler",
               "generic_id": "cluster_handler_0x0019_client",

tests/data/devices/lumi-lumi-vibration-aq1.json

@@ -575,20 +575,6 @@
           "enabled": true,
           "primary": false,
           "cluster_handlers": [
-            {
-              "class_name": "OtaClusterHandler",
-              "generic_id": "cluster_handler_0x0019",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 25,
-                "name": "Ota",
-                "type": "server"
-              },
-              "id": "1:0x0019",
-              "unique_id": "00:15:8d:00:02:af:97:27:1:0x0019",
-              "status": "INITIALIZED",
-              "value_attribute": null
-            },
             {
               "class_name": "OtaClientClusterHandler",
               "generic_id": "cluster_handler_0x0019_client",

tests/data/devices/somfy-sonesse-28-wf-li-ion-roller.json

@@ -585,20 +585,6 @@
           "enabled": true,
           "primary": false,
           "cluster_handlers": [
-            {
-              "class_name": "OtaClusterHandler",
-              "generic_id": "cluster_handler_0x0019",
-              "endpoint_id": 232,
-              "cluster": {
-                "id": 25,
-                "name": "Ota",
-                "type": "server"
-              },
-              "id": "232:0x0019",
-              "unique_id": "ab:cd:ef:12:7b:7c:3f:a7:232:0x0019",
-              "status": "INITIALIZED",
-              "value_attribute": null
-            },
             {
               "class_name": "OtaClientClusterHandler",
               "generic_id": "cluster_handler_0x0019_client",

tests/data/devices/third-reality-inc-3rss007z.json

@@ -291,7 +291,7 @@
           "unique_id": "28:2c:02:bf:ff:e0:16:01-1-25-firmware_update",
           "migrate_unique_ids": [],
           "platform": "update",
-          "class_name": "FirmwareUpdateEntity",
+          "class_name": "FirmwareUpdateServerEntity",
           "translation_key": null,
           "translation_placeholders": null,
           "device_class": "firmware",
@@ -323,7 +323,7 @@
           "supported_features": 7
         },
         "state": {
-          "class_name": "FirmwareUpdateEntity",
+          "class_name": "FirmwareUpdateServerEntity",
           "available": true,
           "installed_version": null,
           "in_progress": false,

zha/application/platforms/update.py

@@ -21,7 +21,7 @@
 from zha.zigbee.cluster_handlers.const import (
     CLUSTER_HANDLER_ATTRIBUTE_UPDATED,
     CLUSTER_HANDLER_OTA,
-    CLUSTER_HANDLER_OTA_SERVER,
+    CLIENT_CLUSTER_HANDLER_OTA,
 )
 from zha.zigbee.endpoint import Endpoint
 
@@ -265,7 +265,7 @@ async def on_remove(self) -> None:
         await super().on_remove()
 
 
-@CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_OTA)
+@CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLIENT_CLUSTER_HANDLER_OTA)
 class FirmwareUpdateEntity(BaseFirmwareUpdateEntity):
     """Representation of a ZHA firmware update entity."""
 
@@ -282,7 +282,7 @@ def __init__(
         super().__init__(cluster_handlers, endpoint, device, **kwargs)
 
         self._ota_cluster_handler: ClusterHandler = self.cluster_handlers[
-            CLUSTER_HANDLER_OTA
+            CLIENT_CLUSTER_HANDLER_OTA
         ]
         self._attr_installed_version: str | None = self._get_cluster_version()
         self._compatible_images: OtaImagesResult = OtaImagesResult(
@@ -312,7 +312,7 @@ def _get_cluster_version(self) -> str | None:
         return None
 
 
-@CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_OTA_SERVER)
+@CONFIG_DIAGNOSTIC_MATCH(cluster_handler_names=CLUSTER_HANDLER_OTA)
 class FirmwareUpdateServerEntity(BaseFirmwareUpdateEntity):
     """Representation of a ZHA firmware update entity."""
 
@@ -330,7 +330,7 @@ def __init__(
 
         # Some devices make it a server cluster, not a client cluster...
         self._ota_cluster_handler: ClusterHandler = self.cluster_handlers[
-            CLUSTER_HANDLER_OTA_SERVER
+            CLUSTER_HANDLER_OTA
         ]
         self._attr_installed_version: str | None = self._get_cluster_version()
         self._compatible_images: OtaImagesResult = OtaImagesResult(

zha/zigbee/cluster_handlers/__init__.py

@@ -731,6 +731,11 @@ def __init__(self, *args, **kwargs) -> None:
         self._generic_id += "_client"
         self._id += "_client"
 
+    @functools.cached_property
+    def name(self) -> str:
+        """Return friendly name."""
+        return self.cluster.ep_attribute + "_client" or self._generic_id
+
     def attribute_updated(self, attrid: int, value: Any, timestamp: datetime) -> None:
         """Handle an attribute updated on this cluster."""
         super().attribute_updated(attrid, value, timestamp)

zha/zigbee/cluster_handlers/const.py

@@ -68,7 +68,6 @@
 CLUSTER_HANDLER_OCCUPANCY: Final[str] = "occupancy"
 CLUSTER_HANDLER_ON_OFF: Final[str] = "on_off"
 CLUSTER_HANDLER_OTA: Final[str] = "ota"
-CLUSTER_HANDLER_OTA_SERVER: Final[str] = "ota_server"
 CLUSTER_HANDLER_POWER_CONFIGURATION: Final[str] = "power"
 CLUSTER_HANDLER_PRESSURE: Final[str] = "pressure"
 CLUSTER_HANDLER_SHADE: Final[str] = "shade"
@@ -81,6 +80,7 @@
 ZONE: Final[str] = CLUSTER_HANDLER_ZONE
 CLUSTER_HANDLER_INOVELLI = "inovelli_vzm31sn_cluster"
 
+CLIENT_CLUSTER_HANDLER_OTA: Final[str] = CLUSTER_HANDLER_OTA + "_client"
 AQARA_OPPLE_CLUSTER: Final[int] = 0xFCC0
 IKEA_AIR_PURIFIER_CLUSTER: Final[int] = 0xFC7D
 IKEA_REMOTE_CLUSTER: Final[int] = 0xFC80