diff --git a/pyproject.toml b/pyproject.toml index a7735e30e..e1db85996 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -99,6 +99,7 @@ asyncio_default_fixture_loop_scope = "function" target-version = "py312" [tool.ruff.lint] +ignore-init-module-imports = false select = [ "B002", # Python does not support the unary prefix increment "B007", # Loop control variable {name} not used within loop body diff --git a/tests/conftest.py b/tests/conftest.py index 990d3e1ba..f2d1a3e40 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,14 +1,14 @@ """Test configuration for the ZHA component.""" import asyncio -from collections.abc import Callable, Generator +from collections.abc import Generator from contextlib import contextmanager import logging import os import reprlib import threading from types import TracebackType -from unittest.mock import AsyncMock, MagicMock, patch +from unittest.mock import patch import looptime import pytest @@ -340,17 +340,6 @@ async def zha_gateway( yield gateway -@pytest.fixture(scope="session", autouse=True) -def disable_request_retry_delay(): - """Disable ZHA request retrying delay to speed up failures.""" - - with patch( - "zha.zigbee.cluster_handlers.RETRYABLE_REQUEST_DECORATOR", - zigpy.util.retryable_request(tries=3, delay=0), - ): - yield - - @pytest.fixture(scope="session", autouse=True) def globally_load_quirks(): """Load quirks automatically so that ZHA tests run deterministically in isolation. @@ -369,24 +358,6 @@ def globally_load_quirks(): yield -@pytest.fixture -def cluster_handler() -> Callable: - """Clueter handler mock factory fixture.""" - - def cluster_handler_factory( - name: str, cluster_id: int, endpoint_id: int = 1 - ) -> MagicMock: - ch = MagicMock() - ch.name = name - ch.generic_id = f"cluster_handler_0x{cluster_id:04x}" - ch.id = f"{endpoint_id}:0x{cluster_id:04x}" - ch.async_configure = AsyncMock() - ch.async_initialize = AsyncMock() - return ch - - return cluster_handler_factory - - def pytest_collection_modifyitems(config, items): """Add the looptime marker to all tests except the test_async.py file.""" for item in items: diff --git a/tests/data/devices/adeo-sin-4-fp-21-equ.json b/tests/data/devices/adeo-sin-4-fp-21-equ.json index 6f4093675..4a6b0d38e 100644 --- a/tests/data/devices/adeo-sin-4-fp-21-equ.json +++ b/tests/data/devices/adeo-sin-4-fp-21-equ.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:85:66:cc:2e", "nwk": "0xA2CE", "manufacturer": "Adeo", @@ -294,22 +294,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:66:cc:2e", "endpoint_id": 1, "available": true, @@ -342,22 +326,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:85:66:cc:2e", "endpoint_id": 1, "available": true, @@ -391,22 +359,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PhillipsRemoteClusterHandler", - "generic_id": "cluster_handler_0xfc00", - "endpoint_id": 1, - "cluster": { - "id": 64512, - "name": "PilotWireCluster", - "type": "server" - }, - "id": "1:0xfc00", - "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0xfc00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:66:cc:2e", "endpoint_id": 1, "available": true, @@ -444,22 +396,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:66:cc:2e", "endpoint_id": 1, "available": true, @@ -488,22 +424,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:66:cc:2e", "endpoint_id": 1, "available": true, @@ -532,22 +452,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:85:66:cc:2e", "endpoint_id": 1, "available": true, @@ -584,22 +488,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:85:66:cc:2e", "endpoint_id": 1, "available": true, @@ -638,22 +526,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:85:66:cc:2e", "endpoint_id": 1, "available": true, @@ -682,22 +554,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:66:cc:2e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/adeo-zb-watersensor-d0001.json b/tests/data/devices/adeo-zb-watersensor-d0001.json index f7df21c63..b25eb645b 100644 --- a/tests/data/devices/adeo-zb-watersensor-d0001.json +++ b/tests/data/devices/adeo-zb-watersensor-d0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7b:20:a5:2a", "nwk": "0x35E0", "manufacturer": "ADEO", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:7b:20:a5:2a:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:20:a5:2a", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:7b:20:a5:2a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:20:a5:2a", "endpoint_id": 1, "available": true, @@ -276,22 +244,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:20:a5:2a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:20:a5:2a", "endpoint_id": 1, "available": true, @@ -320,22 +272,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:20:a5:2a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:20:a5:2a", "endpoint_id": 1, "available": true, @@ -364,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:7b:20:a5:2a:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:7b:20:a5:2a", "endpoint_id": 1, "available": true, @@ -415,22 +335,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:7b:20:a5:2a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:20:a5:2a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/adurosmart-eria-ad-rgbw3001.json b/tests/data/devices/adurosmart-eria-ad-rgbw3001.json index c89d4c9ba..b9bcbc9ca 100644 --- a/tests/data/devices/adurosmart-eria-ad-rgbw3001.json +++ b/tests/data/devices/adurosmart-eria-ad-rgbw3001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:03:42:9e:da", "nwk": "0x0403", "manufacturer": "AduroSmart Eria", @@ -330,22 +330,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, @@ -378,50 +362,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, @@ -482,22 +422,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, @@ -529,22 +453,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, @@ -576,22 +484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, @@ -623,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, @@ -670,22 +546,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, @@ -717,22 +577,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, @@ -766,22 +610,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, @@ -817,22 +645,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, @@ -861,22 +673,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, @@ -907,22 +703,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:15:8d:00:03:42:9e:da:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:03:42:9e:da", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/adurosmart-eria-adurolight-csc.json b/tests/data/devices/adurosmart-eria-adurolight-csc.json index 5577558a1..d0673a595 100644 --- a/tests/data/devices/adurosmart-eria-adurolight-csc.json +++ b/tests/data/devices/adurosmart-eria-adurolight-csc.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1a:8b:d4:d3", "nwk": "0x489C", "manufacturer": "AduroSmart Eria", @@ -270,22 +270,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:1a:8b:d4:d3:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:8b:d4:d3", "endpoint_id": 1, "available": true, @@ -318,22 +302,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1a:8b:d4:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:8b:d4:d3", "endpoint_id": 1, "available": true, @@ -362,22 +330,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1a:8b:d4:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:8b:d4:d3", "endpoint_id": 1, "available": true, @@ -406,22 +358,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:1a:8b:d4:d3:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:1a:8b:d4:d3", "endpoint_id": 1, "available": true, @@ -458,22 +394,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:1a:8b:d4:d3:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1a:8b:d4:d3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/adurosmart-eria-vms-adurolight.json b/tests/data/devices/adurosmart-eria-vms-adurolight.json index 9c2b9aa3c..69e1a1836 100644 --- a/tests/data/devices/adurosmart-eria-vms-adurolight.json +++ b/tests/data/devices/adurosmart-eria-vms-adurolight.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:07:5b:40:90", "nwk": "0x2DE4", "manufacturer": "AduroSmart Eria", @@ -198,22 +198,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "00:15:8d:00:07:5b:40:90:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:07:5b:40:90", "endpoint_id": 1, "available": true, @@ -243,22 +227,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:07:5b:40:90:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:07:5b:40:90", "endpoint_id": 1, "available": true, @@ -291,22 +259,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:07:5b:40:90:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:07:5b:40:90", "endpoint_id": 1, "available": true, @@ -335,22 +287,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:07:5b:40:90:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:07:5b:40:90", "endpoint_id": 1, "available": true, @@ -379,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:15:8d:00:07:5b:40:90:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:8d:00:07:5b:40:90", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aeotec-zga004.json b/tests/data/devices/aeotec-zga004.json index 5a5c3c7ef..5a3adbf94 100644 --- a/tests/data/devices/aeotec-zga004.json +++ b/tests/data/devices/aeotec-zga004.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:3a:bc:09:e8", "nwk": "0x7433", "manufacturer": "AEOTEC", @@ -566,22 +566,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:3a:bc:09:e8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:bc:09:e8", "endpoint_id": 1, "available": true, @@ -614,22 +598,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:3a:bc:09:e8:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3a:bc:09:e8", "endpoint_id": 1, "available": true, @@ -662,22 +630,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 2, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "2:0x0102", - "unique_id": "ab:cd:ef:12:3a:bc:09:e8:2:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3a:bc:09:e8", "endpoint_id": 2, "available": true, @@ -712,22 +664,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3a:bc:09:e8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:bc:09:e8", "endpoint_id": 1, "available": true, @@ -756,22 +692,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3a:bc:09:e8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:bc:09:e8", "endpoint_id": 1, "available": true, @@ -800,22 +720,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:3a:bc:09:e8:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:3a:bc:09:e8", "endpoint_id": 1, "available": true, @@ -844,22 +748,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:3a:bc:09:e8:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3a:bc:09:e8", "endpoint_id": 1, "available": true, @@ -888,22 +776,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 2, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "2:0x0102", - "unique_id": "ab:cd:ef:12:3a:bc:09:e8:2:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3a:bc:09:e8", "endpoint_id": 2, "available": true, @@ -934,22 +806,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:3a:bc:09:e8:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3a:bc:09:e8", "endpoint_id": 1, "available": true, @@ -982,22 +838,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 2, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "2:0x0102", - "unique_id": "ab:cd:ef:12:3a:bc:09:e8:2:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3a:bc:09:e8", "endpoint_id": 2, "available": true, @@ -1032,22 +872,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:3a:bc:09:e8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:bc:09:e8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/alab-alab-co2-1-1.json b/tests/data/devices/alab-alab-co2-1-1.json index c88da4949..da85a7702 100644 --- a/tests/data/devices/alab-alab-co2-1-1.json +++ b/tests/data/devices/alab-alab-co2-1-1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d6:a0:0e:81", "nwk": "0xBF64", "manufacturer": "Alab", @@ -208,22 +208,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d6:a0:0e:81:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:a0:0e:81", "endpoint_id": 1, "available": true, @@ -256,22 +240,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d6:a0:0e:81:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:a0:0e:81", "endpoint_id": 1, "available": true, @@ -300,22 +268,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d6:a0:0e:81:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:a0:0e:81", "endpoint_id": 1, "available": true, @@ -344,22 +296,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:d6:a0:0e:81:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d6:a0:0e:81", "endpoint_id": 1, "available": true, @@ -388,22 +324,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:d6:a0:0e:81:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d6:a0:0e:81", "endpoint_id": 1, "available": true, @@ -432,22 +352,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "CarbonDioxideConcentrationClusterHandler", - "generic_id": "cluster_handler_0x040d", - "endpoint_id": 1, - "cluster": { - "id": 1037, - "name": "Carbon Dioxide (CO\u2082) Concentration", - "type": "server" - }, - "id": "1:0x040d", - "unique_id": "ab:cd:ef:12:d6:a0:0e:81:1:0x040d", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d6:a0:0e:81", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-airrtc-aeu001.json b/tests/data/devices/aqara-lumi-airrtc-aeu001.json index 686407d5b..d773ad64f 100644 --- a/tests/data/devices/aqara-lumi-airrtc-aeu001.json +++ b/tests/data/devices/aqara-lumi-airrtc-aeu001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:71:24:74:6a", "nwk": "0x6323", "manufacturer": "Aqara", @@ -743,22 +743,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -791,22 +775,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -872,22 +840,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -919,22 +871,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -966,22 +902,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -1015,22 +935,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -1059,22 +963,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -1103,22 +991,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -1147,22 +1019,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -1191,22 +1047,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -1233,7 +1073,7 @@ "unique_id": "ab:cd:ef:12:71:24:74:6a-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1242,22 +1082,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -1266,7 +1090,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -1291,22 +1115,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -1335,22 +1143,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -1381,22 +1173,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, @@ -1425,22 +1201,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:71:24:74:6a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:24:74:6a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-airrtc-aeu005.json b/tests/data/devices/aqara-lumi-airrtc-aeu005.json index cc578ebce..d25acc4f9 100644 --- a/tests/data/devices/aqara-lumi-airrtc-aeu005.json +++ b/tests/data/devices/aqara-lumi-airrtc-aeu005.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a8:b1:ca:04", "nwk": "0x3EB5", "manufacturer": "Aqara", @@ -445,22 +445,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:a8:b1:ca:04:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:b1:ca:04", "endpoint_id": 1, "available": true, @@ -493,22 +477,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a8:b1:ca:04:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a8:b1:ca:04", "endpoint_id": 1, "available": true, @@ -574,22 +542,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a8:b1:ca:04:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a8:b1:ca:04", "endpoint_id": 1, "available": true, @@ -621,22 +573,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a8:b1:ca:04:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a8:b1:ca:04", "endpoint_id": 1, "available": true, @@ -668,22 +604,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a8:b1:ca:04:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a8:b1:ca:04", "endpoint_id": 1, "available": true, @@ -717,22 +637,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a8:b1:ca:04:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:b1:ca:04", "endpoint_id": 1, "available": true, @@ -761,22 +665,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a8:b1:ca:04:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:b1:ca:04", "endpoint_id": 1, "available": true, @@ -805,22 +693,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a8:b1:ca:04:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a8:b1:ca:04", "endpoint_id": 1, "available": true, @@ -849,22 +721,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a8:b1:ca:04:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a8:b1:ca:04", "endpoint_id": 1, "available": true, @@ -895,22 +751,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a8:b1:ca:04:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:b1:ca:04", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-curtain-acn04.json b/tests/data/devices/aqara-lumi-curtain-acn04.json index 315f762b8..b05426a9a 100644 --- a/tests/data/devices/aqara-lumi-curtain-acn04.json +++ b/tests/data/devices/aqara-lumi-curtain-acn04.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a4:d1:4f:84", "nwk": "0x1B19", "manufacturer": "Aqara", @@ -172,22 +172,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:a4:d1:4f:84:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a4:d1:4f:84", "endpoint_id": 1, "available": true, @@ -220,22 +204,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:a4:d1:4f:84:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:a4:d1:4f:84", "endpoint_id": 1, "available": true, @@ -270,22 +238,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a4:d1:4f:84:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a4:d1:4f:84", "endpoint_id": 1, "available": true, @@ -314,22 +266,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a4:d1:4f:84:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a4:d1:4f:84", "endpoint_id": 1, "available": true, @@ -358,22 +294,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:a4:d1:4f:84:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:a4:d1:4f:84", "endpoint_id": 1, "available": true, @@ -404,22 +324,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a4:d1:4f:84:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a4:d1:4f:84", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-light-acn132.json b/tests/data/devices/aqara-lumi-light-acn132.json index cb34ec4b6..0a52a8ced 100644 --- a/tests/data/devices/aqara-lumi-light-acn132.json +++ b/tests/data/devices/aqara-lumi-light-acn132.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f0:a0:54:37", "nwk": "0x31FB", "manufacturer": "Aqara", @@ -289,22 +289,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -337,50 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -439,22 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -486,22 +410,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -533,22 +441,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -580,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -627,22 +503,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -674,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraLedStripT1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -721,22 +565,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraLedStripT1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -768,22 +596,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraLedStripT1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -815,22 +627,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraLedStripT1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -864,22 +660,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraLedStripT1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -911,22 +691,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraLedStripT1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -960,22 +724,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraLedStripT1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -1008,22 +756,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraLedStripT1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -1057,22 +789,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraLedStripT1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -1112,22 +828,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -1156,22 +856,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, @@ -1202,22 +886,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f0:a0:54:37:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:a0:54:37", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-light-agl003.json b/tests/data/devices/aqara-lumi-light-agl003.json index 57aaffb39..3bde2c529 100644 --- a/tests/data/devices/aqara-lumi-light-agl003.json +++ b/tests/data/devices/aqara-lumi-light-agl003.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:83:74:c5:0a", "nwk": "0x35A7", "manufacturer": "Aqara", @@ -638,22 +638,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, @@ -686,50 +670,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, @@ -788,22 +728,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, @@ -835,22 +759,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, @@ -882,22 +790,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, @@ -929,22 +821,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, @@ -976,22 +852,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, @@ -1025,22 +885,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, @@ -1069,22 +913,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, @@ -1113,22 +941,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, @@ -1155,7 +967,7 @@ "unique_id": "ab:cd:ef:12:83:74:c5:0a-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1164,22 +976,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, @@ -1188,7 +984,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -1215,22 +1011,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:83:74:c5:0a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:83:74:c5:0a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-light-agl005.json b/tests/data/devices/aqara-lumi-light-agl005.json index 15448072a..b458d38cd 100644 --- a/tests/data/devices/aqara-lumi-light-agl005.json +++ b/tests/data/devices/aqara-lumi-light-agl005.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5f:ec:15:50", "nwk": "0x47E3", "manufacturer": "Aqara", @@ -644,22 +644,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, @@ -692,50 +676,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, @@ -794,22 +734,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, @@ -841,22 +765,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, @@ -888,22 +796,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, @@ -935,22 +827,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, @@ -982,22 +858,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, @@ -1031,22 +891,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, @@ -1075,22 +919,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, @@ -1119,22 +947,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, @@ -1161,7 +973,7 @@ "unique_id": "ab:cd:ef:12:5f:ec:15:50-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1170,22 +982,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, @@ -1194,7 +990,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -1221,22 +1017,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5f:ec:15:50:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5f:ec:15:50", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-lunar-acn01.json b/tests/data/devices/aqara-lumi-lunar-acn01.json index 092067d7a..65627fac2 100644 --- a/tests/data/devices/aqara-lumi-lunar-acn01.json +++ b/tests/data/devices/aqara-lumi-lunar-acn01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:21:5f:8c", "nwk": "0xCB48", "manufacturer": "aqara", @@ -141,22 +141,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:21:5f:8c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:21:5f:8c", "endpoint_id": 1, "available": true, @@ -189,22 +173,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:21:5f:8c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:21:5f:8c", "endpoint_id": 1, "available": true, @@ -233,22 +201,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:21:5f:8c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:21:5f:8c", "endpoint_id": 1, "available": true, @@ -279,22 +231,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:21:5f:8c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:21:5f:8c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-motion-ac01.json b/tests/data/devices/aqara-lumi-motion-ac01.json index d7c0452c1..b1e452276 100644 --- a/tests/data/devices/aqara-lumi-motion-ac01.json +++ b/tests/data/devices/aqara-lumi-motion-ac01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:4d:2d:5b", "nwk": "0x6826", "manufacturer": "aqara", @@ -209,22 +209,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "54:ef:44:10:00:4d:2d:5b:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "54:ef:44:10:00:4d:2d:5b", "endpoint_id": 1, "available": true, @@ -254,22 +238,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:4d:2d:5b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4d:2d:5b", "endpoint_id": 1, "available": true, @@ -300,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:4d:2d:5b:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4d:2d:5b", "endpoint_id": 1, "available": true, @@ -345,22 +297,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:4d:2d:5b:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4d:2d:5b", "endpoint_id": 1, "available": true, @@ -393,22 +329,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:4d:2d:5b:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4d:2d:5b", "endpoint_id": 1, "available": true, @@ -440,22 +360,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:4d:2d:5b:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4d:2d:5b", "endpoint_id": 1, "available": true, @@ -490,22 +394,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:4d:2d:5b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4d:2d:5b", "endpoint_id": 1, "available": true, @@ -534,22 +422,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:4d:2d:5b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4d:2d:5b", "endpoint_id": 1, "available": true, @@ -578,22 +450,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "54:ef:44:10:00:4d:2d:5b:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "54:ef:44:10:00:4d:2d:5b", "endpoint_id": 1, "available": true, @@ -624,22 +480,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:4d:2d:5b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4d:2d:5b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-sensor-occupy-agl1.json b/tests/data/devices/aqara-lumi-sensor-occupy-agl1.json index d91f945b0..30949abb0 100644 --- a/tests/data/devices/aqara-lumi-sensor-occupy-agl1.json +++ b/tests/data/devices/aqara-lumi-sensor-occupy-agl1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ca:86:17:4b", "nwk": "0x2AFF", "manufacturer": "aqara", @@ -179,22 +179,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, @@ -222,22 +206,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, @@ -313,22 +265,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, @@ -356,22 +292,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, @@ -401,22 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, @@ -450,22 +354,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, @@ -500,22 +388,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, @@ -544,22 +416,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, @@ -588,22 +444,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, @@ -632,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, @@ -678,22 +502,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ca:86:17:4b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:86:17:4b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-sensor-occupy-agl8.json b/tests/data/devices/aqara-lumi-sensor-occupy-agl8.json index d8fa9d6ac..161586c7d 100644 --- a/tests/data/devices/aqara-lumi-sensor-occupy-agl8.json +++ b/tests/data/devices/aqara-lumi-sensor-occupy-agl8.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ae:99:5e:c4", "nwk": "0x9506", "manufacturer": "Aqara", @@ -449,22 +449,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ae:99:5e:c4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ae:99:5e:c4", "endpoint_id": 1, "available": true, @@ -497,22 +481,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ae:99:5e:c4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ae:99:5e:c4", "endpoint_id": 1, "available": true, @@ -541,22 +509,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ae:99:5e:c4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ae:99:5e:c4", "endpoint_id": 1, "available": true, @@ -585,22 +537,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:ae:99:5e:c4:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:ae:99:5e:c4", "endpoint_id": 1, "available": true, @@ -634,22 +570,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:ae:99:5e:c4:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:ae:99:5e:c4", "endpoint_id": 1, "available": true, @@ -678,22 +598,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:ae:99:5e:c4:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:ae:99:5e:c4", "endpoint_id": 1, "available": true, @@ -722,22 +626,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:ae:99:5e:c4:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:ae:99:5e:c4", "endpoint_id": 1, "available": true, @@ -768,22 +656,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ae:99:5e:c4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ae:99:5e:c4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-switch-acn047.json b/tests/data/devices/aqara-lumi-switch-acn047.json index e08676a63..ec37a8636 100644 --- a/tests/data/devices/aqara-lumi-switch-acn047.json +++ b/tests/data/devices/aqara-lumi-switch-acn047.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:3a:b1:1a:5d", "nwk": "0x4DF8", "manufacturer": "Aqara", @@ -807,22 +807,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -855,22 +839,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -902,22 +870,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -951,22 +903,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -999,22 +935,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -1047,22 +967,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 2, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "2:0xfcc0", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:2:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 2, "available": true, @@ -1096,22 +1000,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -1140,22 +1028,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -1184,22 +1056,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "T2MeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -1235,22 +1091,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -1270,7 +1110,7 @@ "unique_id": "ab:cd:ef:12:3a:b1:1a:5d-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1279,22 +1119,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -1303,7 +1127,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 789.9 }, @@ -1327,22 +1151,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -1377,22 +1185,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, @@ -1419,22 +1211,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 2, "available": true, @@ -1463,22 +1239,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:3a:b1:1a:5d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3a:b1:1a:5d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-switch-aeu003.json b/tests/data/devices/aqara-lumi-switch-aeu003.json index 3aebce5ed..96170d567 100644 --- a/tests/data/devices/aqara-lumi-switch-aeu003.json +++ b/tests/data/devices/aqara-lumi-switch-aeu003.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8d:ae:d7:5d", "nwk": "0xFF3D", "manufacturer": "Aqara", @@ -720,22 +720,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:8d:ae:d7:5d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:ae:d7:5d", "endpoint_id": 1, "available": true, @@ -768,22 +752,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:8d:ae:d7:5d:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:8d:ae:d7:5d", "endpoint_id": 1, "available": true, @@ -818,22 +786,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:ae:d7:5d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:ae:d7:5d", "endpoint_id": 1, "available": true, @@ -862,22 +814,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:ae:d7:5d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:ae:d7:5d", "endpoint_id": 1, "available": true, @@ -906,22 +842,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:8d:ae:d7:5d:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:8d:ae:d7:5d", "endpoint_id": 1, "available": true, @@ -957,22 +877,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:8d:ae:d7:5d:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:8d:ae:d7:5d", "endpoint_id": 1, "available": true, @@ -992,7 +896,7 @@ "unique_id": "ab:cd:ef:12:8d:ae:d7:5d-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1001,22 +905,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8d:ae:d7:5d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8d:ae:d7:5d", "endpoint_id": 1, "available": true, @@ -1025,7 +913,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -1052,22 +940,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:8d:ae:d7:5d:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:8d:ae:d7:5d", "endpoint_id": 1, "available": true, @@ -1102,22 +974,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8d:ae:d7:5d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:ae:d7:5d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-switch-agl007.json b/tests/data/devices/aqara-lumi-switch-agl007.json index 05e8db352..a95479219 100644 --- a/tests/data/devices/aqara-lumi-switch-agl007.json +++ b/tests/data/devices/aqara-lumi-switch-agl007.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:92:a0:93:3f", "nwk": "0x21E8", "manufacturer": "Aqara", @@ -809,22 +809,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:92:a0:93:3f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:92:a0:93:3f", "endpoint_id": 1, "available": true, @@ -857,22 +841,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:92:a0:93:3f:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:92:a0:93:3f", "endpoint_id": 1, "available": true, @@ -904,22 +872,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:92:a0:93:3f:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:92:a0:93:3f", "endpoint_id": 1, "available": true, @@ -951,22 +903,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:92:a0:93:3f:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:92:a0:93:3f", "endpoint_id": 1, "available": true, @@ -998,22 +934,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:92:a0:93:3f:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:92:a0:93:3f", "endpoint_id": 1, "available": true, @@ -1047,22 +967,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:92:a0:93:3f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:92:a0:93:3f", "endpoint_id": 1, "available": true, @@ -1091,22 +995,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:92:a0:93:3f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:92:a0:93:3f", "endpoint_id": 1, "available": true, @@ -1135,22 +1023,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:92:a0:93:3f:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:92:a0:93:3f", "endpoint_id": 1, "available": true, @@ -1177,7 +1049,7 @@ "unique_id": "ab:cd:ef:12:92:a0:93:3f-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1186,22 +1058,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:92:a0:93:3f:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:92:a0:93:3f", "endpoint_id": 1, "available": true, @@ -1210,7 +1066,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -1237,22 +1093,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:92:a0:93:3f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:92:a0:93:3f", "endpoint_id": 1, "available": true, @@ -1281,22 +1121,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:92:a0:93:3f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:92:a0:93:3f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aqara-lumi-switch-agl010.json b/tests/data/devices/aqara-lumi-switch-agl010.json index b9c5494cf..2ebe1ffb8 100644 --- a/tests/data/devices/aqara-lumi-switch-agl010.json +++ b/tests/data/devices/aqara-lumi-switch-agl010.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:19:5a:ce:c8", "nwk": "0xBE80", "manufacturer": "Aqara", @@ -738,22 +738,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:19:5a:ce:c8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:19:5a:ce:c8", "endpoint_id": 1, "available": true, @@ -786,22 +770,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:19:5a:ce:c8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:19:5a:ce:c8", "endpoint_id": 1, "available": true, @@ -830,22 +798,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:19:5a:ce:c8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:19:5a:ce:c8", "endpoint_id": 1, "available": true, @@ -874,22 +826,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:19:5a:ce:c8:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:19:5a:ce:c8", "endpoint_id": 1, "available": true, @@ -916,7 +852,7 @@ "unique_id": "ab:cd:ef:12:19:5a:ce:c8-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -925,22 +861,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:19:5a:ce:c8:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:19:5a:ce:c8", "endpoint_id": 1, "available": true, @@ -949,7 +869,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -976,22 +896,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:19:5a:ce:c8:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:19:5a:ce:c8", "endpoint_id": 1, "available": true, @@ -1018,22 +922,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:19:5a:ce:c8:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:19:5a:ce:c8", "endpoint_id": 2, "available": true, @@ -1062,22 +950,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:19:5a:ce:c8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:19:5a:ce:c8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/atlantic-group-adapter-zigbee-fujitsu.json b/tests/data/devices/atlantic-group-adapter-zigbee-fujitsu.json index d6dae5ee6..50a0157b0 100644 --- a/tests/data/devices/atlantic-group-adapter-zigbee-fujitsu.json +++ b/tests/data/devices/atlantic-group-adapter-zigbee-fujitsu.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8e:4d:7a:e3", "nwk": "0xEE14", "manufacturer": "ATLANTIC GROUP", @@ -349,22 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:8e:4d:7a:e3:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8e:4d:7a:e3", "endpoint_id": 1, "available": true, @@ -397,36 +381,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:8e:4d:7a:e3:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - }, - { - "class_name": "FanClusterHandler", - "generic_id": "cluster_handler_0x0202", - "endpoint_id": 1, - "cluster": { - "id": 514, - "name": "Fan Control", - "type": "server" - }, - "id": "1:0x0202", - "unique_id": "ab:cd:ef:12:8e:4d:7a:e3:1:0x0202", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8e:4d:7a:e3", "endpoint_id": 1, "available": true, @@ -495,22 +449,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8e:4d:7a:e3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8e:4d:7a:e3", "endpoint_id": 1, "available": true, @@ -539,22 +477,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8e:4d:7a:e3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8e:4d:7a:e3", "endpoint_id": 1, "available": true, @@ -583,22 +505,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:8e:4d:7a:e3:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:8e:4d:7a:e3", "endpoint_id": 1, "available": true, @@ -627,22 +533,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:8e:4d:7a:e3:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:8e:4d:7a:e3", "endpoint_id": 1, "available": true, @@ -671,22 +561,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:8e:4d:7a:e3:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:8e:4d:7a:e3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aug-winkhaus-gmbh-co-kg-fm-v-zb.json b/tests/data/devices/aug-winkhaus-gmbh-co-kg-fm-v-zb.json index 623379076..099ddff58 100644 --- a/tests/data/devices/aug-winkhaus-gmbh-co-kg-fm-v-zb.json +++ b/tests/data/devices/aug-winkhaus-gmbh-co-kg-fm-v-zb.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d0:2b:45:b6", "nwk": "0xA254", "manufacturer": "Aug. Winkhaus GmbH & Co. KG", @@ -189,22 +189,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:d0:2b:45:b6:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d0:2b:45:b6", "endpoint_id": 1, "available": true, @@ -234,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d0:2b:45:b6:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d0:2b:45:b6", "endpoint_id": 1, "available": true, @@ -282,22 +250,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d0:2b:45:b6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d0:2b:45:b6", "endpoint_id": 1, "available": true, @@ -326,22 +278,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d0:2b:45:b6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d0:2b:45:b6", "endpoint_id": 1, "available": true, @@ -370,22 +306,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:d0:2b:45:b6:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:d0:2b:45:b6", "endpoint_id": 1, "available": true, @@ -421,22 +341,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d0:2b:45:b6:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d0:2b:45:b6", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/aurora-doublesocket50au.json b/tests/data/devices/aurora-doublesocket50au.json index ecfdd63a7..6083e6d81 100644 --- a/tests/data/devices/aurora-doublesocket50au.json +++ b/tests/data/devices/aurora-doublesocket50au.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:73:79:07:f7", "nwk": "0xC337", "manufacturer": "Aurora", @@ -517,22 +517,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:73:79:07:f7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 1, "available": true, @@ -565,22 +549,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:73:79:07:f7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 1, "available": true, @@ -609,22 +577,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:73:79:07:f7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 1, "available": true, @@ -644,7 +596,7 @@ "unique_id": "ab:cd:ef:12:73:79:07:f7-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -653,22 +605,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 1, "available": true, @@ -677,7 +613,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -702,22 +638,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 1, "available": true, @@ -751,22 +671,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 1, "available": true, @@ -799,22 +703,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 1, "available": true, @@ -847,22 +735,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 1, "available": true, @@ -896,22 +768,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 1, "available": true, @@ -936,7 +792,7 @@ "unique_id": "ab:cd:ef:12:73:79:07:f7-2-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -945,22 +801,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 2, "available": true, @@ -969,7 +809,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -994,22 +834,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 2, "available": true, @@ -1043,22 +867,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 2, "available": true, @@ -1091,22 +899,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 2, "available": true, @@ -1139,22 +931,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 2, "available": true, @@ -1188,22 +964,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:73:79:07:f7:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 2, "available": true, @@ -1239,22 +999,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:73:79:07:f7:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 1, "available": true, @@ -1281,22 +1025,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:73:79:07:f7:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 2, "available": true, @@ -1325,22 +1053,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:73:79:07:f7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:73:79:07:f7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/awox-ercu-ws-zm.json b/tests/data/devices/awox-ercu-ws-zm.json index d71e474b5..105f8639f 100644 --- a/tests/data/devices/awox-ercu-ws-zm.json +++ b/tests/data/devices/awox-ercu-ws-zm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:50:b9:32:f5", "nwk": "0x8C7A", "manufacturer": "AwoX", @@ -220,22 +220,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:50:b9:32:f5:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:50:b9:32:f5", "endpoint_id": 1, "available": true, @@ -268,22 +252,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:50:b9:32:f5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:50:b9:32:f5", "endpoint_id": 1, "available": true, @@ -312,22 +280,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:50:b9:32:f5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:50:b9:32:f5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/awox-esmlfzm-w6-dimm.json b/tests/data/devices/awox-esmlfzm-w6-dimm.json index c698bc9fa..dda552e81 100644 --- a/tests/data/devices/awox-esmlfzm-w6-dimm.json +++ b/tests/data/devices/awox-esmlfzm-w6-dimm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4f:a8:bc:46", "nwk": "0x51F1", "manufacturer": "AwoX", @@ -366,22 +366,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:4f:a8:bc:46:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:a8:bc:46", "endpoint_id": 1, "available": true, @@ -411,22 +395,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:4f:a8:bc:46:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:a8:bc:46", "endpoint_id": 1, "available": true, @@ -459,50 +427,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:4f:a8:bc:46:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:4f:a8:bc:46:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:4f:a8:bc:46:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:4f:a8:bc:46", "endpoint_id": 1, "available": true, @@ -560,22 +484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:4f:a8:bc:46:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:4f:a8:bc:46", "endpoint_id": 1, "available": true, @@ -609,22 +517,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:4f:a8:bc:46:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:4f:a8:bc:46", "endpoint_id": 1, "available": true, @@ -660,22 +552,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4f:a8:bc:46:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:a8:bc:46", "endpoint_id": 1, "available": true, @@ -704,22 +580,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4f:a8:bc:46:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:a8:bc:46", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/awox-tlsr82xx.json b/tests/data/devices/awox-tlsr82xx.json index 1fe12fe3c..a283f7ae9 100644 --- a/tests/data/devices/awox-tlsr82xx.json +++ b/tests/data/devices/awox-tlsr82xx.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:01:9c:d6:df:d1", "nwk": "0x2F11", "manufacturer": "AwoX", @@ -220,22 +220,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "a4:c1:38:01:9c:d6:df:d1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:01:9c:d6:df:d1", "endpoint_id": 1, "available": true, @@ -268,22 +252,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:01:9c:d6:df:d1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:01:9c:d6:df:d1", "endpoint_id": 1, "available": true, @@ -312,22 +280,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:01:9c:d6:df:d1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:01:9c:d6:df:d1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/bega-gantenbrink-leuchten-kg-smart-dimmable-light.json b/tests/data/devices/bega-gantenbrink-leuchten-kg-smart-dimmable-light.json index a1c3ae6ae..1ddb18bc7 100644 --- a/tests/data/devices/bega-gantenbrink-leuchten-kg-smart-dimmable-light.json +++ b/tests/data/devices/bega-gantenbrink-leuchten-kg-smart-dimmable-light.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1a:5e:2c:1e", "nwk": "0x1D54", "manufacturer": "BEGA Gantenbrink-Leuchten KG", @@ -455,22 +455,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -503,36 +487,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -586,22 +540,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -633,22 +571,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -680,22 +602,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -727,22 +633,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -774,22 +664,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -821,22 +695,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -870,22 +728,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -919,22 +761,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -968,22 +794,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -1012,22 +822,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, @@ -1058,22 +852,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1a:5e:2c:1e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:5e:2c:1e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/bitron-video-902010-24a.json b/tests/data/devices/bitron-video-902010-24a.json index 26c0da407..16b7ac90d 100644 --- a/tests/data/devices/bitron-video-902010-24a.json +++ b/tests/data/devices/bitron-video-902010-24a.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f4:7b:a3:f4", "nwk": "0xD9B6", "manufacturer": "Bitron Video", @@ -192,22 +192,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:f4:7b:a3:f4:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:7b:a3:f4", "endpoint_id": 1, "available": true, @@ -237,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f4:7b:a3:f4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:7b:a3:f4", "endpoint_id": 1, "available": true, @@ -285,22 +253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "ab:cd:ef:12:f4:7b:a3:f4:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:7b:a3:f4", "endpoint_id": 1, "available": true, @@ -334,22 +286,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "ab:cd:ef:12:f4:7b:a3:f4:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:7b:a3:f4", "endpoint_id": 1, "available": true, @@ -381,22 +317,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "ab:cd:ef:12:f4:7b:a3:f4:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:7b:a3:f4", "endpoint_id": 1, "available": true, @@ -430,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "ab:cd:ef:12:f4:7b:a3:f4:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:7b:a3:f4", "endpoint_id": 1, "available": true, @@ -484,22 +388,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f4:7b:a3:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:7b:a3:f4", "endpoint_id": 1, "available": true, @@ -528,22 +416,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f4:7b:a3:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:7b:a3:f4", "endpoint_id": 1, "available": true, @@ -574,22 +446,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "ab:cd:ef:12:f4:7b:a3:f4:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:7b:a3:f4", "endpoint_id": 1, "available": true, @@ -627,22 +483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 4, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "4:0x0019_client", - "unique_id": "ab:cd:ef:12:f4:7b:a3:f4:4:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:7b:a3:f4", "endpoint_id": 4, "available": true, diff --git a/tests/data/devices/bituo-technik-spm01x001.json b/tests/data/devices/bituo-technik-spm01x001.json index 910a6777f..66a288e63 100644 --- a/tests/data/devices/bituo-technik-spm01x001.json +++ b/tests/data/devices/bituo-technik-spm01x001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8d:c2:0c:51", "nwk": "0x4837", "manufacturer": "BITUO TECHNIK", @@ -317,22 +317,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -365,22 +349,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -409,22 +377,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -453,22 +405,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -503,22 +439,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -544,7 +464,7 @@ "unique_id": "ab:cd:ef:12:8d:c2:0c:51-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -553,22 +473,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -577,7 +481,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -601,22 +505,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -649,22 +537,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -696,22 +568,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -743,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -791,22 +631,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -839,22 +663,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, @@ -889,22 +697,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8d:c2:0c:51:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c2:0c:51", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/bosch-rbsh-mms-zb-eu.json b/tests/data/devices/bosch-rbsh-mms-zb-eu.json index 4399e2d40..ae6ac9f4f 100644 --- a/tests/data/devices/bosch-rbsh-mms-zb-eu.json +++ b/tests/data/devices/bosch-rbsh-mms-zb-eu.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:75:e4:96:a5", "nwk": "0x0CE8", "manufacturer": "Bosch", @@ -661,22 +661,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -709,22 +693,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -759,22 +727,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 2, "available": true, @@ -825,22 +777,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 3, "available": true, @@ -893,22 +829,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfca0", - "endpoint_id": 1, - "cluster": { - "id": 64672, - "name": "BoschLightShutterControlII", - "type": "server" - }, - "id": "1:0xfca0", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0xfca0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -940,22 +860,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfca0", - "endpoint_id": 1, - "cluster": { - "id": 64672, - "name": "BoschLightShutterControlII", - "type": "server" - }, - "id": "1:0xfca0", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0xfca0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -987,22 +891,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfca0", - "endpoint_id": 1, - "cluster": { - "id": 64672, - "name": "BoschLightShutterControlII", - "type": "server" - }, - "id": "1:0xfca0", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0xfca0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1034,22 +922,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfca0", - "endpoint_id": 1, - "cluster": { - "id": 64672, - "name": "BoschLightShutterControlII", - "type": "server" - }, - "id": "1:0xfca0", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0xfca0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1083,22 +955,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfca0", - "endpoint_id": 1, - "cluster": { - "id": 64672, - "name": "BoschLightShutterControlII", - "type": "server" - }, - "id": "1:0xfca0", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0xfca0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1131,22 +987,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfca0", - "endpoint_id": 1, - "cluster": { - "id": 64672, - "name": "BoschLightShutterControlII", - "type": "server" - }, - "id": "1:0xfca0", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0xfca0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1180,22 +1020,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 2, "available": true, @@ -1229,22 +1053,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 3, "available": true, @@ -1280,22 +1088,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1324,22 +1116,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1368,22 +1144,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1420,22 +1180,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1472,22 +1216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1507,7 +1235,7 @@ "unique_id": "ab:cd:ef:12:75:e4:96:a5-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1516,22 +1244,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1540,7 +1252,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -1565,22 +1277,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfca0", - "endpoint_id": 1, - "cluster": { - "id": 64672, - "name": "BoschLightShutterControlII", - "type": "server" - }, - "id": "1:0xfca0", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0xfca0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1611,22 +1307,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1659,22 +1339,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfca0", - "endpoint_id": 1, - "cluster": { - "id": 64672, - "name": "BoschLightShutterControlII", - "type": "server" - }, - "id": "1:0xfca0", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0xfca0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, @@ -1707,22 +1371,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfca0", - "endpoint_id": 2, - "cluster": { - "id": 64672, - "name": "BoschLightShutterControlII", - "type": "server" - }, - "id": "2:0xfca0", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:2:0xfca0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 2, "available": true, @@ -1755,22 +1403,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfca0", - "endpoint_id": 3, - "cluster": { - "id": 64672, - "name": "BoschLightShutterControlII", - "type": "server" - }, - "id": "3:0xfca0", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:3:0xfca0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 3, "available": true, @@ -1805,22 +1437,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:75:e4:96:a5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:75:e4:96:a5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/bosch-rbsh-rth0-bat-zb-eu.json b/tests/data/devices/bosch-rbsh-rth0-bat-zb-eu.json index 8445e3bd5..d33d407f8 100644 --- a/tests/data/devices/bosch-rbsh-rth0-bat-zb-eu.json +++ b/tests/data/devices/bosch-rbsh-rth0-bat-zb-eu.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e1:24:c2:fc", "nwk": "0xFD09", "manufacturer": "Bosch", @@ -357,22 +357,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -402,22 +386,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -450,22 +418,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -530,22 +482,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -577,22 +513,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -624,22 +544,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -671,22 +575,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -718,22 +606,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -765,22 +637,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -812,22 +668,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -859,22 +699,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -908,22 +732,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -958,22 +766,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1005,22 +797,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1054,22 +830,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1102,22 +862,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1150,22 +894,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1197,22 +925,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1247,22 +959,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1291,22 +987,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1335,22 +1015,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1385,22 +1049,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1429,22 +1077,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1473,22 +1105,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1517,22 +1133,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1561,22 +1161,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1605,22 +1189,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1649,22 +1217,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1693,22 +1245,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1739,22 +1275,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1787,22 +1307,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, @@ -1837,22 +1341,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e1:24:c2:fc:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:24:c2:fc", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/bosch-rbsh-rth0-zb-eu.json b/tests/data/devices/bosch-rbsh-rth0-zb-eu.json index 4260f713a..23688b450 100644 --- a/tests/data/devices/bosch-rbsh-rth0-zb-eu.json +++ b/tests/data/devices/bosch-rbsh-rth0-zb-eu.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:28:a4:a4:f2", "nwk": "0x8ED4", "manufacturer": "Bosch", @@ -483,22 +483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -528,22 +512,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -576,22 +544,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -656,22 +608,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -703,22 +639,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -750,22 +670,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -797,22 +701,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -844,22 +732,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -891,22 +763,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -938,22 +794,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -985,22 +825,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1034,22 +858,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1084,22 +892,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1131,22 +923,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1180,22 +956,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1228,22 +988,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1276,22 +1020,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1323,22 +1051,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1373,22 +1085,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1417,22 +1113,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1461,22 +1141,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1505,22 +1169,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1549,22 +1197,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1593,22 +1225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1637,22 +1253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1681,22 +1281,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1725,22 +1309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1769,22 +1337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1813,22 +1365,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1859,22 +1395,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1907,22 +1427,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, @@ -1957,22 +1461,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:28:a4:a4:f2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:a4:a4:f2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/bosch-rbsh-trv0-zb-eu.json b/tests/data/devices/bosch-rbsh-trv0-zb-eu.json index b23e0a0ac..055ec1c08 100644 --- a/tests/data/devices/bosch-rbsh-trv0-zb-eu.json +++ b/tests/data/devices/bosch-rbsh-trv0-zb-eu.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d1:eb:38:68", "nwk": "0x09BA", "manufacturer": "BOSCH", @@ -392,22 +392,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -438,22 +422,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -484,22 +452,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -563,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -610,22 +546,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -657,22 +577,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -704,22 +608,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -751,22 +639,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -798,22 +670,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -847,22 +703,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -894,22 +734,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -941,22 +765,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -990,22 +798,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -1034,22 +826,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -1078,22 +854,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -1130,22 +890,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -1174,22 +918,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -1218,22 +946,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -1262,22 +974,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -1306,22 +1002,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -1350,22 +1030,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -1396,22 +1060,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -1444,22 +1092,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "BoschThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, @@ -1494,22 +1126,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d1:eb:38:68:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:eb:38:68", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/bosch-rbsh-us4btn-zb-eu.json b/tests/data/devices/bosch-rbsh-us4btn-zb-eu.json index 9791b3181..735a1db28 100644 --- a/tests/data/devices/bosch-rbsh-us4btn-zb-eu.json +++ b/tests/data/devices/bosch-rbsh-us4btn-zb-eu.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:55:78:47:04", "nwk": "0x7401", "manufacturer": "Bosch", @@ -363,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:55:78:47:04:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:78:47:04", "endpoint_id": 1, "available": true, @@ -411,22 +395,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:55:78:47:04:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:78:47:04", "endpoint_id": 1, "available": true, @@ -455,22 +423,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:55:78:47:04:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:78:47:04", "endpoint_id": 1, "available": true, @@ -499,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:55:78:47:04:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:55:78:47:04", "endpoint_id": 1, "available": true, @@ -551,22 +487,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:55:78:47:04:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:78:47:04", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/busch-jaeger-rb01.json b/tests/data/devices/busch-jaeger-rb01.json index 7e0597205..bcd39bc72 100644 --- a/tests/data/devices/busch-jaeger-rb01.json +++ b/tests/data/devices/busch-jaeger-rb01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:97:db:33:21", "nwk": "0x71F3", "manufacturer": "Busch-Jaeger", @@ -172,22 +172,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 10, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "10:0x0000", - "unique_id": "ab:cd:ef:12:97:db:33:21:10:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:db:33:21", "endpoint_id": 10, "available": true, @@ -216,22 +200,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 10, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "10:0x0000", - "unique_id": "ab:cd:ef:12:97:db:33:21:10:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:db:33:21", "endpoint_id": 10, "available": true, @@ -262,22 +230,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 10, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "10:0x0019_client", - "unique_id": "ab:cd:ef:12:97:db:33:21:10:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:db:33:21", "endpoint_id": 10, "available": true, diff --git a/tests/data/devices/candeo-c-zb-lc20-dim.json b/tests/data/devices/candeo-c-zb-lc20-dim.json index 691ad97a5..f329defb4 100644 --- a/tests/data/devices/candeo-c-zb-lc20-dim.json +++ b/tests/data/devices/candeo-c-zb-lc20-dim.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:99:61:76:7a", "nwk": "0x5E52", "manufacturer": "Candeo", @@ -216,22 +216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:99:61:76:7a:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:61:76:7a", "endpoint_id": 11, "available": true, @@ -264,36 +248,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:99:61:76:7a:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:99:61:76:7a:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:99:61:76:7a", "endpoint_id": 11, "available": true, @@ -347,22 +301,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:99:61:76:7a:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:99:61:76:7a", "endpoint_id": 11, "available": true, @@ -396,22 +334,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:99:61:76:7a:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:99:61:76:7a", "endpoint_id": 11, "available": true, @@ -447,22 +369,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:99:61:76:7a:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:61:76:7a", "endpoint_id": 11, "available": true, @@ -491,22 +397,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:99:61:76:7a:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:61:76:7a", "endpoint_id": 11, "available": true, @@ -537,22 +427,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:99:61:76:7a:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:61:76:7a", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/candeo-c-zb-lc20-rgb.json b/tests/data/devices/candeo-c-zb-lc20-rgb.json index eb4a57175..cf601316c 100644 --- a/tests/data/devices/candeo-c-zb-lc20-rgb.json +++ b/tests/data/devices/candeo-c-zb-lc20-rgb.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ca:6d:9d:be", "nwk": "0x605B", "manufacturer": "Candeo", @@ -271,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:ca:6d:9d:be:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:6d:9d:be", "endpoint_id": 11, "available": true, @@ -319,50 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:ca:6d:9d:be:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:ca:6d:9d:be:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:ca:6d:9d:be:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:ca:6d:9d:be", "endpoint_id": 11, "available": true, @@ -420,22 +360,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:ca:6d:9d:be:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ca:6d:9d:be", "endpoint_id": 11, "available": true, @@ -469,22 +393,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:ca:6d:9d:be:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ca:6d:9d:be", "endpoint_id": 11, "available": true, @@ -520,22 +428,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:ca:6d:9d:be:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:6d:9d:be", "endpoint_id": 11, "available": true, @@ -564,22 +456,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:ca:6d:9d:be:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:6d:9d:be", "endpoint_id": 11, "available": true, @@ -610,22 +486,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:ca:6d:9d:be:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:6d:9d:be", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/centralite-3300.json b/tests/data/devices/centralite-3300.json index eae5655bf..839702e8a 100644 --- a/tests/data/devices/centralite-3300.json +++ b/tests/data/devices/centralite-3300.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:51:73:e6:7b", "nwk": "0x2463", "manufacturer": "CentraLite", @@ -245,22 +245,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:51:73:e6:7b:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:73:e6:7b", "endpoint_id": 1, "available": true, @@ -290,22 +274,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:51:73:e6:7b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:73:e6:7b", "endpoint_id": 1, "available": true, @@ -338,22 +306,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:51:73:e6:7b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:73:e6:7b", "endpoint_id": 1, "available": true, @@ -382,22 +334,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:51:73:e6:7b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:73:e6:7b", "endpoint_id": 1, "available": true, @@ -426,22 +362,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:51:73:e6:7b:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:51:73:e6:7b", "endpoint_id": 1, "available": true, @@ -478,22 +398,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:51:73:e6:7b:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:51:73:e6:7b", "endpoint_id": 1, "available": true, @@ -524,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:51:73:e6:7b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:73:e6:7b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/centralite-3310-g.json b/tests/data/devices/centralite-3310-g.json index dd767a0ae..9fb6b9434 100644 --- a/tests/data/devices/centralite-3310-g.json +++ b/tests/data/devices/centralite-3310-g.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ef:57:4b:ce", "nwk": "0x52F5", "manufacturer": "CentraLite", @@ -254,22 +254,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ef:57:4b:ce:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:57:4b:ce", "endpoint_id": 1, "available": true, @@ -302,22 +286,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ef:57:4b:ce:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:57:4b:ce", "endpoint_id": 1, "available": true, @@ -346,22 +314,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ef:57:4b:ce:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:57:4b:ce", "endpoint_id": 1, "available": true, @@ -390,22 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:ef:57:4b:ce:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:ef:57:4b:ce", "endpoint_id": 1, "available": true, @@ -442,22 +378,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:ef:57:4b:ce:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:ef:57:4b:ce", "endpoint_id": 1, "available": true, @@ -486,22 +406,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SmartThingsHumidityClusterHandler", - "generic_id": "cluster_handler_0xfc45", - "endpoint_id": 1, - "cluster": { - "id": 64581, - "name": "Smartthings Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0xfc45", - "unique_id": "ab:cd:ef:12:ef:57:4b:ce:1:0xfc45", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:ef:57:4b:ce", "endpoint_id": 1, "available": true, @@ -532,22 +436,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ef:57:4b:ce:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:57:4b:ce", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/centralite-3315-seu.json b/tests/data/devices/centralite-3315-seu.json index 1e1e963f7..610f3b640 100644 --- a/tests/data/devices/centralite-3315-seu.json +++ b/tests/data/devices/centralite-3315-seu.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4d:21:3e:1d", "nwk": "0x7452", "manufacturer": "CentraLite", @@ -289,22 +289,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:4d:21:3e:1d:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:21:3e:1d", "endpoint_id": 1, "available": true, @@ -334,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:4d:21:3e:1d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:21:3e:1d", "endpoint_id": 1, "available": true, @@ -382,22 +350,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4d:21:3e:1d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:21:3e:1d", "endpoint_id": 1, "available": true, @@ -426,22 +378,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4d:21:3e:1d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:21:3e:1d", "endpoint_id": 1, "available": true, @@ -470,22 +406,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:4d:21:3e:1d:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:4d:21:3e:1d", "endpoint_id": 1, "available": true, @@ -522,22 +442,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:4d:21:3e:1d:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:4d:21:3e:1d", "endpoint_id": 1, "available": true, @@ -568,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:4d:21:3e:1d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:21:3e:1d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/centralite-3320-l.json b/tests/data/devices/centralite-3320-l.json index fcbad11f5..726c96c03 100644 --- a/tests/data/devices/centralite-3320-l.json +++ b/tests/data/devices/centralite-3320-l.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0d:6f:00:0f:3a:e3:69", "nwk": "0x970A", "manufacturer": "CentraLite", @@ -275,22 +275,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "00:0d:6f:00:0f:3a:e3:69:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0f:3a:e3:69", "endpoint_id": 1, "available": true, @@ -320,22 +304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0d:6f:00:0f:3a:e3:69:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0f:3a:e3:69", "endpoint_id": 1, "available": true, @@ -368,22 +336,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:0f:3a:e3:69:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0f:3a:e3:69", "endpoint_id": 1, "available": true, @@ -412,22 +364,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:0f:3a:e3:69:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0f:3a:e3:69", "endpoint_id": 1, "available": true, @@ -456,22 +392,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0d:6f:00:0f:3a:e3:69:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0d:6f:00:0f:3a:e3:69", "endpoint_id": 1, "available": true, @@ -508,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "00:0d:6f:00:0f:3a:e3:69:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:0d:6f:00:0f:3a:e3:69", "endpoint_id": 1, "available": true, @@ -554,22 +458,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0d:6f:00:0f:3a:e3:69:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0f:3a:e3:69", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/centralite-3326-l.json b/tests/data/devices/centralite-3326-l.json index e54a19b1c..8f1fb1e81 100644 --- a/tests/data/devices/centralite-3326-l.json +++ b/tests/data/devices/centralite-3326-l.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0d:6f:00:10:9a:14:65", "nwk": "0x2EDE", "manufacturer": "CentraLite", @@ -276,22 +276,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "00:0d:6f:00:10:9a:14:65:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:10:9a:14:65", "endpoint_id": 1, "available": true, @@ -321,22 +305,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0d:6f:00:10:9a:14:65:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:10:9a:14:65", "endpoint_id": 1, "available": true, @@ -369,22 +337,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:10:9a:14:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:10:9a:14:65", "endpoint_id": 1, "available": true, @@ -413,22 +365,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:10:9a:14:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:10:9a:14:65", "endpoint_id": 1, "available": true, @@ -457,22 +393,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0d:6f:00:10:9a:14:65:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0d:6f:00:10:9a:14:65", "endpoint_id": 1, "available": true, @@ -509,22 +429,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "00:0d:6f:00:10:9a:14:65:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:0d:6f:00:10:9a:14:65", "endpoint_id": 1, "available": true, @@ -555,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0d:6f:00:10:9a:14:65:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:10:9a:14:65", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/centralite-3405-l.json b/tests/data/devices/centralite-3405-l.json index c46bd4871..a6adcea8b 100644 --- a/tests/data/devices/centralite-3405-l.json +++ b/tests/data/devices/centralite-3405-l.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0d:6f:00:05:65:83:f2", "nwk": "0x6748", "manufacturer": "CentraLite", @@ -251,22 +251,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasAceClientClusterHandler", - "generic_id": "cluster_handler_0x0501_client", - "endpoint_id": 1, - "cluster": { - "id": 1281, - "name": "IAS Ancillary Control Equipment", - "type": "client" - }, - "id": "1:0x0501_client", - "unique_id": "00:0d:6f:00:05:65:83:f2:1:0x0501_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:05:65:83:f2", "endpoint_id": 1, "available": true, @@ -298,22 +282,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "00:0d:6f:00:05:65:83:f2:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:05:65:83:f2", "endpoint_id": 1, "available": true, @@ -343,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0d:6f:00:05:65:83:f2:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:05:65:83:f2", "endpoint_id": 1, "available": true, @@ -391,22 +343,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:05:65:83:f2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:05:65:83:f2", "endpoint_id": 1, "available": true, @@ -435,22 +371,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:05:65:83:f2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:05:65:83:f2", "endpoint_id": 1, "available": true, @@ -479,22 +399,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0d:6f:00:05:65:83:f2:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0d:6f:00:05:65:83:f2", "endpoint_id": 1, "available": true, @@ -531,22 +435,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "00:0d:6f:00:05:65:83:f2:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:0d:6f:00:05:65:83:f2", "endpoint_id": 1, "available": true, @@ -577,22 +465,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0d:6f:00:05:65:83:f2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:05:65:83:f2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/centralite-systems-3156105.json b/tests/data/devices/centralite-systems-3156105.json index 1575e05f3..78e95611e 100644 --- a/tests/data/devices/centralite-systems-3156105.json +++ b/tests/data/devices/centralite-systems-3156105.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0d:6f:00:03:57:f1:be", "nwk": "0x0E0D", "manufacturer": "CentraLite Systems", @@ -410,22 +410,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, @@ -458,36 +442,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - }, - { - "class_name": "FanClusterHandler", - "generic_id": "cluster_handler_0x0202", - "endpoint_id": 1, - "cluster": { - "id": 514, - "name": "Fan Control", - "type": "server" - }, - "id": "1:0x0202", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0202", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, @@ -555,22 +509,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, @@ -602,22 +540,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, @@ -649,22 +571,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, @@ -698,22 +604,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, @@ -750,22 +640,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, @@ -794,22 +668,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, @@ -838,22 +696,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, @@ -888,22 +730,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, @@ -932,22 +758,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, @@ -978,22 +788,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0d:6f:00:03:57:f1:be:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:03:57:f1:be", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/climaxtechnology-sd8sc-00-00-03-12tc.json b/tests/data/devices/climaxtechnology-sd8sc-00-00-03-12tc.json index 0effe9e6a..99d3a6021 100644 --- a/tests/data/devices/climaxtechnology-sd8sc-00-00-03-12tc.json +++ b/tests/data/devices/climaxtechnology-sd8sc-00-00-03-12tc.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:12:4b:00:09:6e:5a:cf", "nwk": "0xE1BA", "manufacturer": "ClimaxTechnology", @@ -169,22 +169,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "00:12:4b:00:09:6e:5a:cf:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:09:6e:5a:cf", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:12:4b:00:09:6e:5a:cf:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:09:6e:5a:cf", "endpoint_id": 1, "available": true, @@ -262,22 +230,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "00:12:4b:00:09:6e:5a:cf:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:09:6e:5a:cf", "endpoint_id": 1, "available": true, @@ -311,22 +263,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "00:12:4b:00:09:6e:5a:cf:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:09:6e:5a:cf", "endpoint_id": 1, "available": true, @@ -358,22 +294,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "00:12:4b:00:09:6e:5a:cf:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:09:6e:5a:cf", "endpoint_id": 1, "available": true, @@ -407,22 +327,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "00:12:4b:00:09:6e:5a:cf:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:09:6e:5a:cf", "endpoint_id": 1, "available": true, @@ -461,22 +365,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:09:6e:5a:cf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:09:6e:5a:cf", "endpoint_id": 1, "available": true, @@ -505,22 +393,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:09:6e:5a:cf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:09:6e:5a:cf", "endpoint_id": 1, "available": true, @@ -551,22 +423,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "00:12:4b:00:09:6e:5a:cf:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:09:6e:5a:cf", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/computime-slr2b.json b/tests/data/devices/computime-slr2b.json index 5aef92c89..4bccae7d7 100644 --- a/tests/data/devices/computime-slr2b.json +++ b/tests/data/devices/computime-slr2b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2e:80:b4:9c", "nwk": "0x63B9", "manufacturer": "Computime", @@ -588,22 +588,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 5, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "5:0x0003", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:5:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 5, "available": true, @@ -636,22 +620,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 5, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "5:0x0201", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:5:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 5, "available": true, @@ -713,22 +681,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 6, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "6:0x0201", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:6:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 6, "available": true, @@ -792,22 +744,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 5, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "5:0x0201", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:5:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 5, "available": true, @@ -839,22 +775,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 5, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "5:0x0201", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:5:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 5, "available": true, @@ -886,22 +806,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 6, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "6:0x0201", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:6:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 6, "available": true, @@ -933,22 +837,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 6, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "6:0x0201", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:6:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 6, "available": true, @@ -982,22 +870,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 5, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "5:0x0000", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:5:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 5, "available": true, @@ -1026,22 +898,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 5, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "5:0x0000", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:5:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 5, "available": true, @@ -1070,22 +926,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 5, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "5:0x0201", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:5:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 5, "available": true, @@ -1114,22 +954,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 5, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "5:0x0201", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:5:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 5, "available": true, @@ -1158,22 +982,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 6, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "6:0x0201", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:6:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 6, "available": true, @@ -1202,22 +1010,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 6, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "6:0x0201", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:6:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 6, "available": true, @@ -1246,22 +1038,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 6, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "6:0x0201", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:6:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 6, "available": true, @@ -1290,22 +1066,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 7, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "7:0x0402", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:7:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 7, "available": true, @@ -1334,22 +1094,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 8, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "8:0x0402", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:8:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 8, "available": true, @@ -1380,22 +1124,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 5, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "5:0x0019_client", - "unique_id": "ab:cd:ef:12:2e:80:b4:9c:5:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2e:80:b4:9c", "endpoint_id": 5, "available": true, diff --git a/tests/data/devices/d5x84yu-et093wrg.json b/tests/data/devices/d5x84yu-et093wrg.json index e49223141..fad8ce4b7 100644 --- a/tests/data/devices/d5x84yu-et093wrg.json +++ b/tests/data/devices/d5x84yu-et093wrg.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:20:83:1e:1f", "nwk": "0xC0D7", "manufacturer": "D5X84YU", @@ -356,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -399,22 +383,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -442,22 +410,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -487,22 +439,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -535,22 +471,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -614,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -661,22 +565,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -710,22 +598,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -754,22 +626,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -798,22 +654,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -848,22 +688,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossDiagnosticClusterHandler", - "generic_id": "cluster_handler_0x0b05", - "endpoint_id": 1, - "cluster": { - "id": 2821, - "name": "DanfossDiagnosticCluster", - "type": "server" - }, - "id": "1:0x0b05", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0b05", - "status": "INITIALIZED", - "value_attribute": "sw_error_code" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -892,22 +716,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossDiagnosticClusterHandler", - "generic_id": "cluster_handler_0x0b05", - "endpoint_id": 1, - "cluster": { - "id": 2821, - "name": "DanfossDiagnosticCluster", - "type": "server" - }, - "id": "1:0x0b05", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0b05", - "status": "INITIALIZED", - "value_attribute": "sw_error_code" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -960,22 +768,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -1012,22 +804,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -1056,22 +832,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -1100,22 +860,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -1144,22 +888,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -1188,22 +916,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -1232,22 +944,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -1276,22 +972,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, @@ -1322,22 +1002,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:20:83:1e:1f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:20:83:1e:1f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/danfoss-0x8040.json b/tests/data/devices/danfoss-0x8040.json index fff5fb3ef..b0a2a62d6 100644 --- a/tests/data/devices/danfoss-0x8040.json +++ b/tests/data/devices/danfoss-0x8040.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:07:55:96:1c", "nwk": "0x41E2", "manufacturer": "Danfoss", @@ -344,22 +344,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -392,22 +376,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -471,22 +439,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -518,22 +470,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -567,22 +503,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -611,22 +531,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -655,22 +559,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -704,22 +592,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -748,22 +620,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -792,22 +648,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -836,22 +676,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -880,22 +704,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, @@ -926,22 +734,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:07:55:96:1c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:55:96:1c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/danfoss-etrv0103.json b/tests/data/devices/danfoss-etrv0103.json index 3647cec34..f4e787b54 100644 --- a/tests/data/devices/danfoss-etrv0103.json +++ b/tests/data/devices/danfoss-etrv0103.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5c:a0:3f:1c", "nwk": "0x423A", "manufacturer": "Danfoss", @@ -525,22 +525,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -568,22 +552,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -611,22 +579,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -656,22 +608,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -704,22 +640,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -783,22 +703,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -830,22 +734,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -877,22 +765,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -924,22 +796,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -971,22 +827,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1018,22 +858,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1067,22 +891,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1115,22 +923,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1171,22 +963,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1224,22 +1000,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1271,22 +1031,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossUserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1321,22 +1065,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossUserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1370,22 +1098,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1414,22 +1126,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1458,22 +1154,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1508,22 +1188,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossDiagnosticClusterHandler", - "generic_id": "cluster_handler_0x0b05", - "endpoint_id": 1, - "cluster": { - "id": 2821, - "name": "DanfossDiagnosticCluster", - "type": "server" - }, - "id": "1:0x0b05", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0b05", - "status": "INITIALIZED", - "value_attribute": "sw_error_code" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1552,22 +1216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossDiagnosticClusterHandler", - "generic_id": "cluster_handler_0x0b05", - "endpoint_id": 1, - "cluster": { - "id": 2821, - "name": "DanfossDiagnosticCluster", - "type": "server" - }, - "id": "1:0x0b05", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0b05", - "status": "INITIALIZED", - "value_attribute": "sw_error_code" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1620,22 +1268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1672,22 +1304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1716,22 +1332,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1760,22 +1360,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1804,22 +1388,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1848,22 +1416,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1892,22 +1444,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1936,22 +1472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -1982,22 +1502,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -2030,22 +1534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -2078,22 +1566,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -2126,22 +1598,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -2174,22 +1630,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -2222,22 +1662,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -2270,22 +1694,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DanfossThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "DanfossThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, @@ -2320,22 +1728,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5c:a0:3f:1c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:a0:3f:1c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/datek-pop.json b/tests/data/devices/datek-pop.json index d329db931..8161ba1a7 100644 --- a/tests/data/devices/datek-pop.json +++ b/tests/data/devices/datek-pop.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cd:d1:2a:c9", "nwk": "0xDE54", "manufacturer": "Datek", @@ -368,22 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, @@ -416,22 +400,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, @@ -467,22 +435,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, @@ -511,22 +463,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, @@ -555,22 +491,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, @@ -590,7 +510,7 @@ "unique_id": "ab:cd:ef:12:cd:d1:2a:c9-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -599,22 +519,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, @@ -623,7 +527,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT", @@ -649,22 +553,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, @@ -699,22 +587,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, @@ -747,22 +619,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, @@ -797,22 +653,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, @@ -849,22 +689,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, @@ -893,22 +717,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cd:d1:2a:c9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:d1:2a:c9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/datek-ssds.json b/tests/data/devices/datek-ssds.json index 9c01b50f6..6b7f60cae 100644 --- a/tests/data/devices/datek-ssds.json +++ b/tests/data/devices/datek-ssds.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f7:d4:84:f4", "nwk": "0xAACB", "manufacturer": "Datek", @@ -215,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f7:d4:84:f4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:d4:84:f4", "endpoint_id": 1, "available": true, @@ -263,22 +247,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f7:d4:84:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:d4:84:f4", "endpoint_id": 1, "available": true, @@ -307,22 +275,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f7:d4:84:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:d4:84:f4", "endpoint_id": 1, "available": true, @@ -351,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:f7:d4:84:f4:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:f7:d4:84:f4", "endpoint_id": 1, "available": true, @@ -401,22 +337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:f7:d4:84:f4:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:f7:d4:84:f4", "endpoint_id": 1, "available": true, @@ -447,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f7:d4:84:f4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:d4:84:f4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/develco-products-a-s-zhemi-zigbee-external-meter-interface.json b/tests/data/devices/develco-products-a-s-zhemi-zigbee-external-meter-interface.json index 03e548f6e..c8a827a73 100644 --- a/tests/data/devices/develco-products-a-s-zhemi-zigbee-external-meter-interface.json +++ b/tests/data/devices/develco-products-a-s-zhemi-zigbee-external-meter-interface.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:57:64:bf:25", "nwk": "0x2645", "manufacturer": "Develco Products A/S", @@ -305,22 +305,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 2, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "2:0x0003", - "unique_id": "ab:cd:ef:12:57:64:bf:25:2:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:57:64:bf:25", "endpoint_id": 2, "available": true, @@ -353,22 +337,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "ab:cd:ef:12:57:64:bf:25:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:57:64:bf:25", "endpoint_id": 2, "available": true, @@ -397,22 +365,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "ab:cd:ef:12:57:64:bf:25:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:57:64:bf:25", "endpoint_id": 2, "available": true, @@ -441,22 +393,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "ab:cd:ef:12:57:64:bf:25:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:57:64:bf:25", "endpoint_id": 2, "available": true, @@ -493,22 +429,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "ab:cd:ef:12:57:64:bf:25:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:57:64:bf:25", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/digi-xbee3.json b/tests/data/devices/digi-xbee3.json index 556468cee..99c762c92 100644 --- a/tests/data/devices/digi-xbee3.json +++ b/tests/data/devices/digi-xbee3.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e9:3f:91:6d", "nwk": "0x6ADB", "manufacturer": "Digi", @@ -498,22 +498,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 218, - "cluster": { - "id": 13, - "name": "XBeePWM", - "type": "server" - }, - "id": "218:0x000d", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:218:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 218, "available": true, @@ -545,22 +529,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 219, - "cluster": { - "id": 13, - "name": "XBeePWM", - "type": "server" - }, - "id": "219:0x000d", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:219:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 219, "available": true, @@ -594,22 +562,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogInputClusterHandler", - "generic_id": "cluster_handler_0x000c", - "endpoint_id": 208, - "cluster": { - "id": 12, - "name": "XBeeAnalogInput", - "type": "server" - }, - "id": "208:0x000c", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:208:0x000c", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 208, "available": true, @@ -638,22 +590,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogInputClusterHandler", - "generic_id": "cluster_handler_0x000c", - "endpoint_id": 209, - "cluster": { - "id": 12, - "name": "XBeeAnalogInput", - "type": "server" - }, - "id": "209:0x000c", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:209:0x000c", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 209, "available": true, @@ -682,22 +618,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogInputClusterHandler", - "generic_id": "cluster_handler_0x000c", - "endpoint_id": 210, - "cluster": { - "id": 12, - "name": "XBeeAnalogInput", - "type": "server" - }, - "id": "210:0x000c", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:210:0x000c", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 210, "available": true, @@ -726,22 +646,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogInputClusterHandler", - "generic_id": "cluster_handler_0x000c", - "endpoint_id": 211, - "cluster": { - "id": 12, - "name": "XBeeAnalogInput", - "type": "server" - }, - "id": "211:0x000c", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:211:0x000c", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 211, "available": true, @@ -770,22 +674,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogInputClusterHandler", - "generic_id": "cluster_handler_0x000c", - "endpoint_id": 215, - "cluster": { - "id": 12, - "name": "XBeeAnalogInput", - "type": "server" - }, - "id": "215:0x000c", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:215:0x000c", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 215, "available": true, @@ -816,22 +704,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 208, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "208:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:208:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 208, "available": true, @@ -858,22 +730,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 209, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "209:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:209:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 209, "available": true, @@ -900,22 +756,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 210, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "210:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:210:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 210, "available": true, @@ -942,22 +782,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 211, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "211:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:211:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 211, "available": true, @@ -984,22 +808,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 212, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "212:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:212:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 212, "available": true, @@ -1026,22 +834,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 213, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "213:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:213:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 213, "available": true, @@ -1068,22 +860,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 214, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "214:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:214:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 214, "available": true, @@ -1110,22 +886,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 215, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "215:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:215:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 215, "available": true, @@ -1152,22 +912,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 216, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "216:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:216:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 216, "available": true, @@ -1194,22 +938,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 217, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "217:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:217:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 217, "available": true, @@ -1236,22 +964,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 218, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "218:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:218:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 218, "available": true, @@ -1278,22 +990,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 219, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "219:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:219:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 219, "available": true, @@ -1320,22 +1016,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 220, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "220:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:220:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 220, "available": true, @@ -1362,22 +1042,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 221, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "221:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:221:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 221, "available": true, @@ -1404,22 +1068,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 222, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "222:0x0006", - "unique_id": "ab:cd:ef:12:e9:3f:91:6d:222:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:3f:91:6d", "endpoint_id": 222, "available": true, diff --git a/tests/data/devices/ecodim-bv-eco-dim-05-zigbee.json b/tests/data/devices/ecodim-bv-eco-dim-05-zigbee.json index b7e1cac6c..23dfb9f72 100644 --- a/tests/data/devices/ecodim-bv-eco-dim-05-zigbee.json +++ b/tests/data/devices/ecodim-bv-eco-dim-05-zigbee.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c4:e7:80:b2", "nwk": "0x36C7", "manufacturer": "EcoDim BV", @@ -369,22 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:c4:e7:80:b2:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c4:e7:80:b2", "endpoint_id": 1, "available": true, @@ -417,36 +401,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:c4:e7:80:b2:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:c4:e7:80:b2:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:c4:e7:80:b2", "endpoint_id": 1, "available": true, @@ -498,36 +452,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:c4:e7:80:b2:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 2, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "2:0x0008", - "unique_id": "ab:cd:ef:12:c4:e7:80:b2:2:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:c4:e7:80:b2", "endpoint_id": 2, "available": true, @@ -581,22 +505,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:c4:e7:80:b2:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:c4:e7:80:b2", "endpoint_id": 1, "available": true, @@ -628,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 2, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "2:0x0008", - "unique_id": "ab:cd:ef:12:c4:e7:80:b2:2:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:c4:e7:80:b2", "endpoint_id": 2, "available": true, @@ -677,22 +569,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c4:e7:80:b2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c4:e7:80:b2", "endpoint_id": 1, "available": true, @@ -721,22 +597,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c4:e7:80:b2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c4:e7:80:b2", "endpoint_id": 1, "available": true, @@ -767,22 +627,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c4:e7:80:b2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c4:e7:80:b2", "endpoint_id": 1, "available": true, @@ -816,22 +660,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "ab:cd:ef:12:c4:e7:80:b2:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c4:e7:80:b2", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/ecodim-bv-ecodim-zigbee-3-0.json b/tests/data/devices/ecodim-bv-ecodim-zigbee-3-0.json index 8739ab7ae..5079030fb 100644 --- a/tests/data/devices/ecodim-bv-ecodim-zigbee-3-0.json +++ b/tests/data/devices/ecodim-bv-ecodim-zigbee-3-0.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:52:45:d8:51", "nwk": "0xC5F8", "manufacturer": "EcoDim BV", @@ -379,22 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:52:45:d8:51:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:45:d8:51", "endpoint_id": 1, "available": true, @@ -427,36 +411,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:52:45:d8:51:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:52:45:d8:51:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:52:45:d8:51", "endpoint_id": 1, "available": true, @@ -508,36 +462,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:52:45:d8:51:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 2, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "2:0x0008", - "unique_id": "ab:cd:ef:12:52:45:d8:51:2:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:52:45:d8:51", "endpoint_id": 2, "available": true, @@ -591,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:52:45:d8:51:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:52:45:d8:51", "endpoint_id": 1, "available": true, @@ -638,22 +546,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 2, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "2:0x0008", - "unique_id": "ab:cd:ef:12:52:45:d8:51:2:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:52:45:d8:51", "endpoint_id": 2, "available": true, @@ -687,22 +579,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:52:45:d8:51:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:45:d8:51", "endpoint_id": 1, "available": true, @@ -731,22 +607,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:52:45:d8:51:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:45:d8:51", "endpoint_id": 1, "available": true, @@ -777,22 +637,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:52:45:d8:51:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:45:d8:51", "endpoint_id": 1, "available": true, @@ -826,22 +670,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "ab:cd:ef:12:52:45:d8:51:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:45:d8:51", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/ecolink-4655bc0-r.json b/tests/data/devices/ecolink-4655bc0-r.json index 130f32cb8..75b58aa62 100644 --- a/tests/data/devices/ecolink-4655bc0-r.json +++ b/tests/data/devices/ecolink-4655bc0-r.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0d:6f:00:11:15:94:aa", "nwk": "0xF8F6", "manufacturer": "Ecolink", @@ -263,22 +263,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "00:0d:6f:00:11:15:94:aa:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:11:15:94:aa", "endpoint_id": 1, "available": true, @@ -308,22 +292,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0d:6f:00:11:15:94:aa:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:11:15:94:aa", "endpoint_id": 1, "available": true, @@ -356,22 +324,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:11:15:94:aa:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:11:15:94:aa", "endpoint_id": 1, "available": true, @@ -400,22 +352,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:11:15:94:aa:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:11:15:94:aa", "endpoint_id": 1, "available": true, @@ -444,22 +380,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0d:6f:00:11:15:94:aa:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0d:6f:00:11:15:94:aa", "endpoint_id": 1, "available": true, @@ -496,22 +416,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "00:0d:6f:00:11:15:94:aa:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:0d:6f:00:11:15:94:aa", "endpoint_id": 1, "available": true, @@ -542,22 +446,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0d:6f:00:11:15:94:aa:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:11:15:94:aa", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/enktro-acmidea.json b/tests/data/devices/enktro-acmidea.json index 0ac2e7d26..877d80c62 100644 --- a/tests/data/devices/enktro-acmidea.json +++ b/tests/data/devices/enktro-acmidea.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f9:10:2d:81", "nwk": "0xBF3D", "manufacturer": "enktro", @@ -281,22 +281,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f9:10:2d:81:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:10:2d:81", "endpoint_id": 1, "available": true, @@ -329,36 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:f9:10:2d:81:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - }, - { - "class_name": "FanClusterHandler", - "generic_id": "cluster_handler_0x0202", - "endpoint_id": 1, - "cluster": { - "id": 514, - "name": "Fan Control", - "type": "server" - }, - "id": "1:0x0202", - "unique_id": "ab:cd:ef:12:f9:10:2d:81:1:0x0202", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:10:2d:81", "endpoint_id": 1, "available": true, @@ -427,22 +381,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f9:10:2d:81:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:10:2d:81", "endpoint_id": 1, "available": true, @@ -471,22 +409,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f9:10:2d:81:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:10:2d:81", "endpoint_id": 1, "available": true, @@ -515,22 +437,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:f9:10:2d:81:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:f9:10:2d:81", "endpoint_id": 1, "available": true, @@ -559,22 +465,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:f9:10:2d:81:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:f9:10:2d:81", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ericsity-gl-c-008p.json b/tests/data/devices/ericsity-gl-c-008p.json index 9333c7deb..0491d2639 100755 --- a/tests/data/devices/ericsity-gl-c-008p.json +++ b/tests/data/devices/ericsity-gl-c-008p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:de:fe:e0:60:b8", "nwk": "0xC536", "manufacturer": "ERICSITY", @@ -301,22 +301,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "a4:c1:38:de:fe:e0:60:b8:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:de:fe:e0:60:b8", "endpoint_id": 11, "available": true, @@ -349,50 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "a4:c1:38:de:fe:e0:60:b8:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "a4:c1:38:de:fe:e0:60:b8:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "a4:c1:38:de:fe:e0:60:b8:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "a4:c1:38:de:fe:e0:60:b8", "endpoint_id": 11, "available": true, @@ -453,22 +393,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "a4:c1:38:de:fe:e0:60:b8:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "a4:c1:38:de:fe:e0:60:b8", "endpoint_id": 11, "available": true, @@ -500,22 +424,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "a4:c1:38:de:fe:e0:60:b8:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "a4:c1:38:de:fe:e0:60:b8", "endpoint_id": 11, "available": true, @@ -549,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "a4:c1:38:de:fe:e0:60:b8:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "a4:c1:38:de:fe:e0:60:b8", "endpoint_id": 11, "available": true, @@ -600,22 +492,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "a4:c1:38:de:fe:e0:60:b8:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:de:fe:e0:60:b8", "endpoint_id": 11, "available": true, @@ -644,22 +520,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "a4:c1:38:de:fe:e0:60:b8:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:de:fe:e0:60:b8", "endpoint_id": 11, "available": true, @@ -690,22 +550,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "a4:c1:38:de:fe:e0:60:b8:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:de:fe:e0:60:b8", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/ericsity-gl-c-009p.json b/tests/data/devices/ericsity-gl-c-009p.json index 25a7e4cb2..8a0cf6176 100644 --- a/tests/data/devices/ericsity-gl-c-009p.json +++ b/tests/data/devices/ericsity-gl-c-009p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:44:c6:4d:75:c2", "nwk": "0x6C17", "manufacturer": "ERICSITY", @@ -337,22 +337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "a4:c1:38:44:c6:4d:75:c2:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:44:c6:4d:75:c2", "endpoint_id": 11, "available": true, @@ -385,50 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "a4:c1:38:44:c6:4d:75:c2:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "a4:c1:38:44:c6:4d:75:c2:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "a4:c1:38:44:c6:4d:75:c2:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "a4:c1:38:44:c6:4d:75:c2", "endpoint_id": 11, "available": true, @@ -483,22 +423,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "a4:c1:38:44:c6:4d:75:c2:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "a4:c1:38:44:c6:4d:75:c2", "endpoint_id": 11, "available": true, @@ -530,22 +454,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "a4:c1:38:44:c6:4d:75:c2:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "a4:c1:38:44:c6:4d:75:c2", "endpoint_id": 11, "available": true, @@ -579,22 +487,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "a4:c1:38:44:c6:4d:75:c2:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "a4:c1:38:44:c6:4d:75:c2", "endpoint_id": 11, "available": true, @@ -630,22 +522,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "a4:c1:38:44:c6:4d:75:c2:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:44:c6:4d:75:c2", "endpoint_id": 11, "available": true, @@ -674,22 +550,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "a4:c1:38:44:c6:4d:75:c2:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:44:c6:4d:75:c2", "endpoint_id": 11, "available": true, @@ -720,22 +580,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "a4:c1:38:44:c6:4d:75:c2:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:44:c6:4d:75:c2", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/espressif-zigbeeanalogdevice.json b/tests/data/devices/espressif-zigbeeanalogdevice.json index b638f9bb8..f118db1bb 100644 --- a/tests/data/devices/espressif-zigbeeanalogdevice.json +++ b/tests/data/devices/espressif-zigbeeanalogdevice.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:39:a2:73:55", "nwk": "0xA62B", "manufacturer": "Espressif", @@ -237,22 +237,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:39:a2:73:55:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:a2:73:55", "endpoint_id": 1, "available": true, @@ -285,22 +269,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 1, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "1:0x000d", - "unique_id": "ab:cd:ef:12:39:a2:73:55:1:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:39:a2:73:55", "endpoint_id": 1, "available": true, @@ -334,22 +302,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:a2:73:55:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:a2:73:55", "endpoint_id": 1, "available": true, @@ -378,22 +330,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:a2:73:55:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:a2:73:55", "endpoint_id": 1, "available": true, @@ -422,22 +358,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogInputClusterHandler", - "generic_id": "cluster_handler_0x000c", - "endpoint_id": 1, - "cluster": { - "id": 12, - "name": "AnalogInput", - "type": "server" - }, - "id": "1:0x000c", - "unique_id": "ab:cd:ef:12:39:a2:73:55:1:0x000c", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:39:a2:73:55", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/espressif-zigbeebinaryoutputdevice.json b/tests/data/devices/espressif-zigbeebinaryoutputdevice.json index 1e52b817f..a02fe39c0 100644 --- a/tests/data/devices/espressif-zigbeebinaryoutputdevice.json +++ b/tests/data/devices/espressif-zigbeebinaryoutputdevice.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:39:a2:73:56", "nwk": "0xA62B", "manufacturer": "Espressif", @@ -134,22 +134,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:39:a2:73:56:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:a2:73:56", "endpoint_id": 1, "available": true, @@ -182,22 +166,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:a2:73:56:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:a2:73:56", "endpoint_id": 1, "available": true, @@ -226,22 +194,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:a2:73:56:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:a2:73:56", "endpoint_id": 1, "available": true, @@ -272,22 +224,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "BinaryOutputClusterHandler", - "generic_id": "cluster_handler_0x0010", - "endpoint_id": 1, - "cluster": { - "id": 16, - "name": "BinaryOutput", - "type": "server" - }, - "id": "1:0x0010", - "unique_id": "ab:cd:ef:12:39:a2:73:56:1:0x0010", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:39:a2:73:56", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/espressif-zigbeecarbondioxidesensor.json b/tests/data/devices/espressif-zigbeecarbondioxidesensor.json index 98cb6610e..1581a594d 100644 --- a/tests/data/devices/espressif-zigbeecarbondioxidesensor.json +++ b/tests/data/devices/espressif-zigbeecarbondioxidesensor.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "f0:f5:bd:ff:fe:01:86:64", "nwk": "0xE3CE", "manufacturer": "Espressif", @@ -128,22 +128,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 10, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "10:0x0003", - "unique_id": "f0:f5:bd:ff:fe:01:86:64:10:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:f5:bd:ff:fe:01:86:64", "endpoint_id": 10, "available": true, @@ -176,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 10, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "10:0x0000", - "unique_id": "f0:f5:bd:ff:fe:01:86:64:10:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:f5:bd:ff:fe:01:86:64", "endpoint_id": 10, "available": true, @@ -220,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 10, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "10:0x0000", - "unique_id": "f0:f5:bd:ff:fe:01:86:64:10:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:f5:bd:ff:fe:01:86:64", "endpoint_id": 10, "available": true, @@ -264,22 +216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "CarbonDioxideConcentrationClusterHandler", - "generic_id": "cluster_handler_0x040d", - "endpoint_id": 10, - "cluster": { - "id": 1037, - "name": "Carbon Dioxide (CO\u2082) Concentration", - "type": "server" - }, - "id": "10:0x040d", - "unique_id": "f0:f5:bd:ff:fe:01:86:64:10:0x040d", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "f0:f5:bd:ff:fe:01:86:64", "endpoint_id": 10, "available": true, diff --git a/tests/data/devices/eurotronic-spzb0001.json b/tests/data/devices/eurotronic-spzb0001.json index ac9503325..78ddfccc6 100644 --- a/tests/data/devices/eurotronic-spzb0001.json +++ b/tests/data/devices/eurotronic-spzb0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:32:62:3d:21", "nwk": "0x4D24", "manufacturer": "Eurotronic", @@ -306,22 +306,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, @@ -354,22 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, @@ -433,22 +401,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, @@ -480,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, @@ -527,22 +463,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, @@ -576,22 +496,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, @@ -620,22 +524,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, @@ -664,22 +552,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, @@ -716,22 +588,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, @@ -760,22 +616,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, @@ -804,22 +644,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, @@ -850,22 +674,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:32:62:3d:21:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:62:3d:21", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-ck-bl702-al-01-7009-z102lg03-1.json b/tests/data/devices/ewelink-ck-bl702-al-01-7009-z102lg03-1.json index 0d606382e..a360e22a4 100644 --- a/tests/data/devices/ewelink-ck-bl702-al-01-7009-z102lg03-1.json +++ b/tests/data/devices/ewelink-ck-bl702-al-01-7009-z102lg03-1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "7c:b9:4c:77:33:d0:00:00", "nwk": "0x91F2", "manufacturer": "eWeLink", @@ -319,22 +319,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "7c:b9:4c:77:33:d0:00:00", "endpoint_id": 1, "available": true, @@ -367,50 +351,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "7c:b9:4c:77:33:d0:00:00", "endpoint_id": 1, "available": true, @@ -471,22 +411,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "7c:b9:4c:77:33:d0:00:00", "endpoint_id": 1, "available": true, @@ -518,22 +442,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "7c:b9:4c:77:33:d0:00:00", "endpoint_id": 1, "available": true, @@ -565,22 +473,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "7c:b9:4c:77:33:d0:00:00", "endpoint_id": 1, "available": true, @@ -612,22 +504,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "7c:b9:4c:77:33:d0:00:00", "endpoint_id": 1, "available": true, @@ -661,22 +537,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "7c:b9:4c:77:33:d0:00:00", "endpoint_id": 1, "available": true, @@ -712,22 +572,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "7c:b9:4c:77:33:d0:00:00", "endpoint_id": 1, "available": true, @@ -756,22 +600,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "7c:b9:4c:77:33:d0:00:00", "endpoint_id": 1, "available": true, @@ -802,22 +630,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "7c:b9:4c:77:33:d0:00:00:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "7c:b9:4c:77:33:d0:00:00", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-ck-tlsr8656-ss5-01-7000.json b/tests/data/devices/ewelink-ck-tlsr8656-ss5-01-7000.json index 65d0df262..c5f45fdc5 100644 --- a/tests/data/devices/ewelink-ck-tlsr8656-ss5-01-7000.json +++ b/tests/data/devices/ewelink-ck-tlsr8656-ss5-01-7000.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:40:82:43:82", "nwk": "0xF9A2", "manufacturer": "eWeLink", @@ -186,22 +186,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:40:82:43:82:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:82:43:82", "endpoint_id": 1, "available": true, @@ -234,22 +218,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:40:82:43:82:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:82:43:82", "endpoint_id": 1, "available": true, @@ -278,22 +246,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:40:82:43:82:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:82:43:82", "endpoint_id": 1, "available": true, @@ -322,22 +274,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:40:82:43:82:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:40:82:43:82", "endpoint_id": 1, "available": true, @@ -374,22 +310,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:40:82:43:82:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:82:43:82", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-ds01.json b/tests/data/devices/ewelink-ds01.json index 427bbba95..107e58bd5 100644 --- a/tests/data/devices/ewelink-ds01.json +++ b/tests/data/devices/ewelink-ds01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:39:cb:5d:55", "nwk": "0xE04D", "manufacturer": "eWeLink", @@ -194,22 +194,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:39:cb:5d:55:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:cb:5d:55", "endpoint_id": 1, "available": true, @@ -239,22 +223,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:39:cb:5d:55:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:cb:5d:55", "endpoint_id": 1, "available": true, @@ -287,22 +255,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:cb:5d:55:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:cb:5d:55", "endpoint_id": 1, "available": true, @@ -331,22 +283,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:cb:5d:55:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:cb:5d:55", "endpoint_id": 1, "available": true, @@ -375,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:39:cb:5d:55:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:39:cb:5d:55", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-ms01.json b/tests/data/devices/ewelink-ms01.json index 976a765e7..777aaacb3 100644 --- a/tests/data/devices/ewelink-ms01.json +++ b/tests/data/devices/ewelink-ms01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5e:7d:ad:d6", "nwk": "0x2DF8", "manufacturer": "eWeLink", @@ -194,22 +194,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:5e:7d:ad:d6:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:7d:ad:d6", "endpoint_id": 1, "available": true, @@ -239,22 +223,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:5e:7d:ad:d6:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:7d:ad:d6", "endpoint_id": 1, "available": true, @@ -287,22 +255,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:7d:ad:d6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:7d:ad:d6", "endpoint_id": 1, "available": true, @@ -331,22 +283,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:7d:ad:d6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:7d:ad:d6", "endpoint_id": 1, "available": true, @@ -375,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:5e:7d:ad:d6:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:5e:7d:ad:d6", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-sa-003-zigbee.json b/tests/data/devices/ewelink-sa-003-zigbee.json index 6904f0d34..72ba880db 100644 --- a/tests/data/devices/ewelink-sa-003-zigbee.json +++ b/tests/data/devices/ewelink-sa-003-zigbee.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:12:4b:00:1d:8b:65:1c", "nwk": "0x7F08", "manufacturer": "eWeLink", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:12:4b:00:1d:8b:65:1c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:1d:8b:65:1c", "endpoint_id": 1, "available": true, @@ -202,22 +186,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:1d:8b:65:1c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:1d:8b:65:1c", "endpoint_id": 1, "available": true, @@ -246,22 +214,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:1d:8b:65:1c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:1d:8b:65:1c", "endpoint_id": 1, "available": true, @@ -292,22 +244,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:12:4b:00:1d:8b:65:1c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:12:4b:00:1d:8b:65:1c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-snzb-01p.json b/tests/data/devices/ewelink-snzb-01p.json index ac7842dcf..29a8d0e3f 100644 --- a/tests/data/devices/ewelink-snzb-01p.json +++ b/tests/data/devices/ewelink-snzb-01p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "84:ba:20:ff:fe:d2:41:fe", "nwk": "0x117F", "manufacturer": "eWeLink", @@ -192,22 +192,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "84:ba:20:ff:fe:d2:41:fe:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "84:ba:20:ff:fe:d2:41:fe", "endpoint_id": 1, "available": true, @@ -240,22 +224,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "84:ba:20:ff:fe:d2:41:fe:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "84:ba:20:ff:fe:d2:41:fe", "endpoint_id": 1, "available": true, @@ -284,22 +252,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "84:ba:20:ff:fe:d2:41:fe:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "84:ba:20:ff:fe:d2:41:fe", "endpoint_id": 1, "available": true, @@ -328,22 +280,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "84:ba:20:ff:fe:d2:41:fe:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "84:ba:20:ff:fe:d2:41:fe", "endpoint_id": 1, "available": true, @@ -380,22 +316,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "84:ba:20:ff:fe:d2:41:fe:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "84:ba:20:ff:fe:d2:41:fe", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-snzb-02p.json b/tests/data/devices/ewelink-snzb-02p.json index 3fd59be34..6684c2fbb 100644 --- a/tests/data/devices/ewelink-snzb-02p.json +++ b/tests/data/devices/ewelink-snzb-02p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "90:35:ea:ff:fe:0d:8a:5e", "nwk": "0x767D", "manufacturer": "eWeLink", @@ -212,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "90:35:ea:ff:fe:0d:8a:5e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:35:ea:ff:fe:0d:8a:5e", "endpoint_id": 1, "available": true, @@ -260,22 +244,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "90:35:ea:ff:fe:0d:8a:5e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:35:ea:ff:fe:0d:8a:5e", "endpoint_id": 1, "available": true, @@ -304,22 +272,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "90:35:ea:ff:fe:0d:8a:5e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:35:ea:ff:fe:0d:8a:5e", "endpoint_id": 1, "available": true, @@ -348,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "90:35:ea:ff:fe:0d:8a:5e:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "90:35:ea:ff:fe:0d:8a:5e", "endpoint_id": 1, "available": true, @@ -397,22 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "90:35:ea:ff:fe:0d:8a:5e:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "90:35:ea:ff:fe:0d:8a:5e", "endpoint_id": 1, "available": true, @@ -441,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "90:35:ea:ff:fe:0d:8a:5e:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "90:35:ea:ff:fe:0d:8a:5e", "endpoint_id": 1, "available": true, @@ -487,22 +391,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "90:35:ea:ff:fe:0d:8a:5e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:35:ea:ff:fe:0d:8a:5e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-snzb-03p.json b/tests/data/devices/ewelink-snzb-03p.json index 4b45d658b..4f485d526 100644 --- a/tests/data/devices/ewelink-snzb-03p.json +++ b/tests/data/devices/ewelink-snzb-03p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cb:2e:18:c7", "nwk": "0xFB8F", "manufacturer": "eWeLink", @@ -251,22 +251,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:cb:2e:18:c7:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:cb:2e:18:c7", "endpoint_id": 1, "available": true, @@ -294,22 +278,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:cb:2e:18:c7:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:2e:18:c7", "endpoint_id": 1, "available": true, @@ -339,22 +307,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:cb:2e:18:c7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:2e:18:c7", "endpoint_id": 1, "available": true, @@ -387,22 +339,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:cb:2e:18:c7:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:cb:2e:18:c7", "endpoint_id": 1, "available": true, @@ -436,22 +372,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cb:2e:18:c7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:2e:18:c7", "endpoint_id": 1, "available": true, @@ -480,22 +400,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cb:2e:18:c7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:2e:18:c7", "endpoint_id": 1, "available": true, @@ -524,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:cb:2e:18:c7:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:cb:2e:18:c7", "endpoint_id": 1, "available": true, @@ -576,22 +464,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cb:2e:18:c7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:2e:18:c7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-snzb-04p.json b/tests/data/devices/ewelink-snzb-04p.json index e4971cea2..9553fe292 100644 --- a/tests/data/devices/ewelink-snzb-04p.json +++ b/tests/data/devices/ewelink-snzb-04p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:81:81:05:49", "nwk": "0xD45C", "manufacturer": "eWeLink", @@ -263,22 +263,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:81:81:05:49:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:81:05:49", "endpoint_id": 1, "available": true, @@ -306,22 +290,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "Sonoff contact cluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:81:81:05:49:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:81:05:49", "endpoint_id": 1, "available": true, @@ -351,22 +319,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:81:81:05:49:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:81:05:49", "endpoint_id": 1, "available": true, @@ -399,22 +351,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:81:81:05:49:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:81:05:49", "endpoint_id": 1, "available": true, @@ -443,22 +379,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:81:81:05:49:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:81:05:49", "endpoint_id": 1, "available": true, @@ -487,22 +407,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:81:81:05:49:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:81:81:05:49", "endpoint_id": 1, "available": true, @@ -539,22 +443,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:81:81:05:49:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:81:05:49", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-th01.json b/tests/data/devices/ewelink-th01.json index 3f7817168..29ecf120f 100644 --- a/tests/data/devices/ewelink-th01.json +++ b/tests/data/devices/ewelink-th01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:62:93:68:a8", "nwk": "0x6F45", "manufacturer": "eWeLink", @@ -180,22 +180,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:62:93:68:a8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:62:93:68:a8", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:62:93:68:a8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:62:93:68:a8", "endpoint_id": 1, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:62:93:68:a8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:62:93:68:a8", "endpoint_id": 1, "available": true, @@ -316,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:62:93:68:a8:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:62:93:68:a8", "endpoint_id": 1, "available": true, @@ -366,22 +302,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:62:93:68:a8:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:62:93:68:a8", "endpoint_id": 1, "available": true, @@ -410,22 +330,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:62:93:68:a8:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:62:93:68:a8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-wb01.json b/tests/data/devices/ewelink-wb01.json index 5aafb8ca5..be8aa03df 100644 --- a/tests/data/devices/ewelink-wb01.json +++ b/tests/data/devices/ewelink-wb01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:12:4b:00:25:12:e0:f9", "nwk": "0x7D23", "manufacturer": "eWeLink", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:12:4b:00:25:12:e0:f9:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:25:12:e0:f9", "endpoint_id": 1, "available": true, @@ -208,22 +192,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:25:12:e0:f9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:25:12:e0:f9", "endpoint_id": 1, "available": true, @@ -252,22 +220,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:25:12:e0:f9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:25:12:e0:f9", "endpoint_id": 1, "available": true, @@ -296,22 +248,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:12:4b:00:25:12:e0:f9:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:12:4b:00:25:12:e0:f9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-zb-sw01.json b/tests/data/devices/ewelink-zb-sw01.json index c649b59bd..331104b3f 100644 --- a/tests/data/devices/ewelink-zb-sw01.json +++ b/tests/data/devices/ewelink-zb-sw01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f8:28:3c:8f", "nwk": "0x8674", "manufacturer": "eWeLink", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f8:28:3c:8f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f8:28:3c:8f", "endpoint_id": 1, "available": true, @@ -202,22 +186,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:f8:28:3c:8f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f8:28:3c:8f", "endpoint_id": 1, "available": true, @@ -270,22 +238,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f8:28:3c:8f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f8:28:3c:8f", "endpoint_id": 1, "available": true, @@ -314,22 +266,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f8:28:3c:8f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f8:28:3c:8f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ewelink-zb-sw02.json b/tests/data/devices/ewelink-zb-sw02.json index 926d93528..76240d18a 100644 --- a/tests/data/devices/ewelink-zb-sw02.json +++ b/tests/data/devices/ewelink-zb-sw02.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:12:4b:00:23:b7:d0:ce", "nwk": "0x3F29", "manufacturer": "eWeLink", @@ -222,22 +222,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:12:4b:00:23:b7:d0:ce:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:23:b7:d0:ce", "endpoint_id": 1, "available": true, @@ -270,22 +254,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:12:4b:00:23:b7:d0:ce:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:12:4b:00:23:b7:d0:ce", "endpoint_id": 1, "available": true, @@ -336,22 +304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "00:12:4b:00:23:b7:d0:ce:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:12:4b:00:23:b7:d0:ce", "endpoint_id": 2, "available": true, @@ -404,22 +356,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:23:b7:d0:ce:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:23:b7:d0:ce", "endpoint_id": 1, "available": true, @@ -448,22 +384,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:23:b7:d0:ce:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:23:b7:d0:ce", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ezviz-cs-t55-r100-g.json b/tests/data/devices/ezviz-cs-t55-r100-g.json index e2d54cffb..4708ebcb7 100644 --- a/tests/data/devices/ezviz-cs-t55-r100-g.json +++ b/tests/data/devices/ezviz-cs-t55-r100-g.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:9d:90:be:b1", "nwk": "0x05CB", "manufacturer": "EZVIZ", @@ -409,22 +409,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:9d:90:be:b1:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:90:be:b1", "endpoint_id": 1, "available": true, @@ -454,22 +438,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:9d:90:be:b1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:90:be:b1", "endpoint_id": 1, "available": true, @@ -502,22 +470,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9d:90:be:b1:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9d:90:be:b1", "endpoint_id": 1, "available": true, @@ -580,22 +532,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9d:90:be:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:90:be:b1", "endpoint_id": 1, "available": true, @@ -624,22 +560,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9d:90:be:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:90:be:b1", "endpoint_id": 1, "available": true, @@ -668,22 +588,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:9d:90:be:b1:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:9d:90:be:b1", "endpoint_id": 1, "available": true, @@ -718,22 +622,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:9d:90:be:b1:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:9d:90:be:b1", "endpoint_id": 1, "available": true, @@ -762,22 +650,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9d:90:be:b1:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9d:90:be:b1", "endpoint_id": 1, "available": true, @@ -806,22 +678,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9d:90:be:b1:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9d:90:be:b1", "endpoint_id": 1, "available": true, @@ -852,22 +708,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:9d:90:be:b1:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:9d:90:be:b1", "endpoint_id": 1, "available": true, @@ -896,22 +736,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:9d:90:be:b1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:90:be:b1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/feibit-inc-co-fzb56-zcw27lx1-0.json b/tests/data/devices/feibit-inc-co-fzb56-zcw27lx1-0.json index e1852d27a..1f1e39bbd 100644 --- a/tests/data/devices/feibit-inc-co-fzb56-zcw27lx1-0.json +++ b/tests/data/devices/feibit-inc-co-fzb56-zcw27lx1-0.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:12:4b:00:1c:46:5f:b1", "nwk": "0xE2CF", "manufacturer": "Feibit Inc co. ", @@ -317,22 +317,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:12:4b:00:1c:46:5f:b1:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:1c:46:5f:b1", "endpoint_id": 11, "available": true, @@ -365,50 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:12:4b:00:1c:46:5f:b1:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:12:4b:00:1c:46:5f:b1:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:12:4b:00:1c:46:5f:b1:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:12:4b:00:1c:46:5f:b1", "endpoint_id": 11, "available": true, @@ -469,22 +409,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:12:4b:00:1c:46:5f:b1:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:1c:46:5f:b1", "endpoint_id": 11, "available": true, @@ -513,22 +437,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:12:4b:00:1c:46:5f:b1:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:1c:46:5f:b1", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/frient-a-s-aqszb-110.json b/tests/data/devices/frient-a-s-aqszb-110.json index c91ca4634..0d50bc2d6 100644 --- a/tests/data/devices/frient-a-s-aqszb-110.json +++ b/tests/data/devices/frient-a-s-aqszb-110.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:36:00:1f:ee", "nwk": "0xCA04", "manufacturer": "frient A/S", @@ -277,22 +277,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 38, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "38:0x0003", - "unique_id": "00:15:bc:00:36:00:1f:ee:38:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:36:00:1f:ee", "endpoint_id": 38, "available": true, @@ -325,22 +309,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 38, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "38:0x0000", - "unique_id": "00:15:bc:00:36:00:1f:ee:38:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:36:00:1f:ee", "endpoint_id": 38, "available": true, @@ -369,22 +337,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 38, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "38:0x0000", - "unique_id": "00:15:bc:00:36:00:1f:ee:38:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:36:00:1f:ee", "endpoint_id": 38, "available": true, @@ -413,22 +365,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 38, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "38:0x0001", - "unique_id": "00:15:bc:00:36:00:1f:ee:38:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:bc:00:36:00:1f:ee", "endpoint_id": 38, "available": true, @@ -465,22 +401,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 38, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "38:0x0402", - "unique_id": "00:15:bc:00:36:00:1f:ee:38:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:bc:00:36:00:1f:ee", "endpoint_id": 38, "available": true, @@ -509,22 +429,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 38, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "38:0x0405", - "unique_id": "00:15:bc:00:36:00:1f:ee:38:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:bc:00:36:00:1f:ee", "endpoint_id": 38, "available": true, @@ -553,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc03", - "endpoint_id": 38, - "cluster": { - "id": 64515, - "name": "VOC Level", - "type": "server" - }, - "id": "38:0xfc03", - "unique_id": "00:15:bc:00:36:00:1f:ee:38:0xfc03", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:36:00:1f:ee", "endpoint_id": 38, "available": true, @@ -599,22 +487,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 38, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "38:0x0019_client", - "unique_id": "00:15:bc:00:36:00:1f:ee:38:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:36:00:1f:ee", "endpoint_id": 38, "available": true, diff --git a/tests/data/devices/frient-a-s-emizb-141.json b/tests/data/devices/frient-a-s-emizb-141.json index f5b305652..02be95a06 100644 --- a/tests/data/devices/frient-a-s-emizb-141.json +++ b/tests/data/devices/frient-a-s-emizb-141.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:1b:10:01:5c", "nwk": "0x09EF", "manufacturer": "frient A/S", @@ -342,22 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 2, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "2:0x0003", - "unique_id": "00:15:bc:00:1b:10:01:5c:2:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1b:10:01:5c", "endpoint_id": 2, "available": true, @@ -388,22 +372,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfd10", - "endpoint_id": 2, - "cluster": { - "id": 64784, - "name": "ManufacturerMetering", - "type": "server" - }, - "id": "2:0xfd10", - "unique_id": "00:15:bc:00:1b:10:01:5c:2:0xfd10", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1b:10:01:5c", "endpoint_id": 2, "available": true, @@ -433,22 +401,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfd10", - "endpoint_id": 2, - "cluster": { - "id": 64784, - "name": "ManufacturerMetering", - "type": "server" - }, - "id": "2:0xfd10", - "unique_id": "00:15:bc:00:1b:10:01:5c:2:0xfd10", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1b:10:01:5c", "endpoint_id": 2, "available": true, @@ -482,22 +434,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "00:15:bc:00:1b:10:01:5c:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1b:10:01:5c", "endpoint_id": 2, "available": true, @@ -526,22 +462,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "00:15:bc:00:1b:10:01:5c:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1b:10:01:5c", "endpoint_id": 2, "available": true, @@ -570,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "00:15:bc:00:1b:10:01:5c:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:bc:00:1b:10:01:5c", "endpoint_id": 2, "available": true, @@ -622,22 +526,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "00:15:bc:00:1b:10:01:5c:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:15:bc:00:1b:10:01:5c", "endpoint_id": 2, "available": true, @@ -674,22 +562,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "00:15:bc:00:1b:10:01:5c:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:15:bc:00:1b:10:01:5c", "endpoint_id": 2, "available": true, @@ -728,22 +600,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "00:15:bc:00:1b:10:01:5c:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1b:10:01:5c", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/frient-a-s-emizb-151.json b/tests/data/devices/frient-a-s-emizb-151.json index c50a1ed29..a2d152951 100644 --- a/tests/data/devices/frient-a-s-emizb-151.json +++ b/tests/data/devices/frient-a-s-emizb-151.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:74:0f:89:c3", "nwk": "0x7B86", "manufacturer": "frient A/S", @@ -1186,22 +1186,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 2, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "2:0x0003", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1234,22 +1218,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1278,22 +1246,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1322,22 +1274,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1371,22 +1307,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1423,22 +1343,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1475,22 +1379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1518,7 +1406,7 @@ "unique_id": "ab:cd:ef:12:74:0f:89:c3-2-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1527,22 +1415,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1551,7 +1423,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 517.0, "measurement_type": "ACTIVE_MEASUREMENT, PHASE_A_MEASUREMENT, PHASE_B_MEASUREMENT, PHASE_C_MEASUREMENT" @@ -1576,22 +1448,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1625,22 +1481,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1674,22 +1514,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1723,22 +1547,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1772,22 +1580,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1821,22 +1613,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1870,22 +1646,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1919,22 +1679,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -1968,22 +1712,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, @@ -2019,22 +1747,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "ab:cd:ef:12:74:0f:89:c3:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:74:0f:89:c3", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/frient-a-s-flszb-110.json b/tests/data/devices/frient-a-s-flszb-110.json index f427b04d2..58afdea0f 100644 --- a/tests/data/devices/frient-a-s-flszb-110.json +++ b/tests/data/devices/frient-a-s-flszb-110.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:33:00:76:9a", "nwk": "0xC4C5", "manufacturer": "frient A/S", @@ -315,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 35, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "35:0x0500", - "unique_id": "00:15:bc:00:33:00:76:9a:35:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:33:00:76:9a", "endpoint_id": 35, "available": true, @@ -360,22 +344,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 35, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "35:0x0003", - "unique_id": "00:15:bc:00:33:00:76:9a:35:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:33:00:76:9a", "endpoint_id": 35, "available": true, @@ -408,22 +376,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 35, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "35:0x0000", - "unique_id": "00:15:bc:00:33:00:76:9a:35:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:33:00:76:9a", "endpoint_id": 35, "available": true, @@ -452,22 +404,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 35, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "35:0x0000", - "unique_id": "00:15:bc:00:33:00:76:9a:35:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:33:00:76:9a", "endpoint_id": 35, "available": true, @@ -496,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 35, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "35:0x0001", - "unique_id": "00:15:bc:00:33:00:76:9a:35:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:bc:00:33:00:76:9a", "endpoint_id": 35, "available": true, @@ -546,22 +466,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 38, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "38:0x0402", - "unique_id": "00:15:bc:00:33:00:76:9a:38:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:bc:00:33:00:76:9a", "endpoint_id": 38, "available": true, @@ -592,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 35, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "35:0x0502", - "unique_id": "00:15:bc:00:33:00:76:9a:35:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:33:00:76:9a", "endpoint_id": 35, "available": true, @@ -638,22 +526,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 35, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "35:0x0019_client", - "unique_id": "00:15:bc:00:33:00:76:9a:35:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:33:00:76:9a", "endpoint_id": 35, "available": true, diff --git a/tests/data/devices/frient-a-s-hmszb-120.json b/tests/data/devices/frient-a-s-hmszb-120.json index 9971b5dcb..7807cc353 100644 --- a/tests/data/devices/frient-a-s-hmszb-120.json +++ b/tests/data/devices/frient-a-s-hmszb-120.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:35:00:26:aa", "nwk": "0x89A7", "manufacturer": "frient A/S", @@ -265,22 +265,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 38, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "38:0x0003", - "unique_id": "00:15:bc:00:35:00:26:aa:38:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:35:00:26:aa", "endpoint_id": 38, "available": true, @@ -313,22 +297,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 38, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "38:0x0000", - "unique_id": "00:15:bc:00:35:00:26:aa:38:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:35:00:26:aa", "endpoint_id": 38, "available": true, @@ -357,22 +325,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 38, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "38:0x0000", - "unique_id": "00:15:bc:00:35:00:26:aa:38:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:35:00:26:aa", "endpoint_id": 38, "available": true, @@ -401,22 +353,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 38, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "38:0x0001", - "unique_id": "00:15:bc:00:35:00:26:aa:38:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:bc:00:35:00:26:aa", "endpoint_id": 38, "available": true, @@ -453,22 +389,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 38, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "38:0x0402", - "unique_id": "00:15:bc:00:35:00:26:aa:38:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:bc:00:35:00:26:aa", "endpoint_id": 38, "available": true, @@ -497,22 +417,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 38, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "38:0x0405", - "unique_id": "00:15:bc:00:35:00:26:aa:38:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:bc:00:35:00:26:aa", "endpoint_id": 38, "available": true, @@ -543,22 +447,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 38, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "38:0x0019_client", - "unique_id": "00:15:bc:00:35:00:26:aa:38:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:35:00:26:aa", "endpoint_id": 38, "available": true, diff --git a/tests/data/devices/frient-a-s-iomzb-110.json b/tests/data/devices/frient-a-s-iomzb-110.json index 0fa540efa..b1330d95b 100644 --- a/tests/data/devices/frient-a-s-iomzb-110.json +++ b/tests/data/devices/frient-a-s-iomzb-110.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:42:00:09:1c", "nwk": "0xD5B7", "manufacturer": "frient A/S", @@ -535,22 +535,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 112, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "112:0x000f", - "unique_id": "00:15:bc:00:42:00:09:1c:112:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:15:bc:00:42:00:09:1c", "endpoint_id": 112, "available": true, @@ -578,22 +562,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 113, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "113:0x000f", - "unique_id": "00:15:bc:00:42:00:09:1c:113:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:15:bc:00:42:00:09:1c", "endpoint_id": 113, "available": true, @@ -621,22 +589,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 114, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "114:0x000f", - "unique_id": "00:15:bc:00:42:00:09:1c:114:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:15:bc:00:42:00:09:1c", "endpoint_id": 114, "available": true, @@ -664,22 +616,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 115, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "115:0x000f", - "unique_id": "00:15:bc:00:42:00:09:1c:115:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:15:bc:00:42:00:09:1c", "endpoint_id": 115, "available": true, @@ -709,22 +645,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 112, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "112:0x0003", - "unique_id": "00:15:bc:00:42:00:09:1c:112:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:42:00:09:1c", "endpoint_id": 112, "available": true, @@ -757,22 +677,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 112, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "112:0x0000", - "unique_id": "00:15:bc:00:42:00:09:1c:112:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:42:00:09:1c", "endpoint_id": 112, "available": true, @@ -801,22 +705,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 112, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "112:0x0000", - "unique_id": "00:15:bc:00:42:00:09:1c:112:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:42:00:09:1c", "endpoint_id": 112, "available": true, @@ -847,22 +735,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 116, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "116:0x0006", - "unique_id": "00:15:bc:00:42:00:09:1c:116:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:15:bc:00:42:00:09:1c", "endpoint_id": 116, "available": true, @@ -889,22 +761,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 117, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "117:0x0006", - "unique_id": "00:15:bc:00:42:00:09:1c:117:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:15:bc:00:42:00:09:1c", "endpoint_id": 117, "available": true, @@ -933,22 +789,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 112, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "112:0x0019_client", - "unique_id": "00:15:bc:00:42:00:09:1c:112:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:42:00:09:1c", "endpoint_id": 112, "available": true, diff --git a/tests/data/devices/frient-a-s-kepzb-110.json b/tests/data/devices/frient-a-s-kepzb-110.json index 87af490b1..ec95fe604 100644 --- a/tests/data/devices/frient-a-s-kepzb-110.json +++ b/tests/data/devices/frient-a-s-kepzb-110.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:43:00:4a:39", "nwk": "0x0422", "manufacturer": "frient A/S", @@ -273,22 +273,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasAceClientClusterHandler", - "generic_id": "cluster_handler_0x0501_client", - "endpoint_id": 44, - "cluster": { - "id": 1281, - "name": "IAS Ancillary Control Equipment", - "type": "client" - }, - "id": "44:0x0501_client", - "unique_id": "00:15:bc:00:43:00:4a:39:44:0x0501_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:43:00:4a:39", "endpoint_id": 44, "available": true, @@ -320,22 +304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 44, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "44:0x0500", - "unique_id": "00:15:bc:00:43:00:4a:39:44:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:43:00:4a:39", "endpoint_id": 44, "available": true, @@ -365,22 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 44, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "44:0x0003", - "unique_id": "00:15:bc:00:43:00:4a:39:44:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:43:00:4a:39", "endpoint_id": 44, "available": true, @@ -413,22 +365,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 44, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "44:0x0000", - "unique_id": "00:15:bc:00:43:00:4a:39:44:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:43:00:4a:39", "endpoint_id": 44, "available": true, @@ -457,22 +393,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 44, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "44:0x0000", - "unique_id": "00:15:bc:00:43:00:4a:39:44:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:43:00:4a:39", "endpoint_id": 44, "available": true, @@ -501,22 +421,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 44, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "44:0x0001", - "unique_id": "00:15:bc:00:43:00:4a:39:44:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:bc:00:43:00:4a:39", "endpoint_id": 44, "available": true, @@ -555,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 44, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "44:0x0019_client", - "unique_id": "00:15:bc:00:43:00:4a:39:44:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:43:00:4a:39", "endpoint_id": 44, "available": true, diff --git a/tests/data/devices/frient-a-s-moszb-140.json b/tests/data/devices/frient-a-s-moszb-140.json index aec5850bd..15bfe8ee5 100644 --- a/tests/data/devices/frient-a-s-moszb-140.json +++ b/tests/data/devices/frient-a-s-moszb-140.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a5:49:dd:25", "nwk": "0x0281", "manufacturer": "frient A/S", @@ -495,22 +495,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 34, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "34:0x0406", - "unique_id": "ab:cd:ef:12:a5:49:dd:25:34:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:a5:49:dd:25", "endpoint_id": 34, "available": true, @@ -538,22 +522,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 35, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "35:0x0500", - "unique_id": "ab:cd:ef:12:a5:49:dd:25:35:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a5:49:dd:25", "endpoint_id": 35, "available": true, @@ -581,22 +549,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 35, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "35:0x0500", - "unique_id": "ab:cd:ef:12:a5:49:dd:25:35:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a5:49:dd:25", "endpoint_id": 35, "available": true, @@ -626,22 +578,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 34, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "34:0x0003", - "unique_id": "ab:cd:ef:12:a5:49:dd:25:34:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a5:49:dd:25", "endpoint_id": 34, "available": true, @@ -674,22 +610,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 34, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "34:0x0000", - "unique_id": "ab:cd:ef:12:a5:49:dd:25:34:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a5:49:dd:25", "endpoint_id": 34, "available": true, @@ -718,22 +638,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 34, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "34:0x0000", - "unique_id": "ab:cd:ef:12:a5:49:dd:25:34:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a5:49:dd:25", "endpoint_id": 34, "available": true, @@ -762,22 +666,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 35, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "35:0x0001", - "unique_id": "ab:cd:ef:12:a5:49:dd:25:35:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:a5:49:dd:25", "endpoint_id": 35, "available": true, @@ -814,22 +702,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 38, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "38:0x0402", - "unique_id": "ab:cd:ef:12:a5:49:dd:25:38:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:a5:49:dd:25", "endpoint_id": 38, "available": true, @@ -858,22 +730,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 39, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "39:0x0400", - "unique_id": "ab:cd:ef:12:a5:49:dd:25:39:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:a5:49:dd:25", "endpoint_id": 39, "available": true, @@ -904,22 +760,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 35, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "35:0x0019_client", - "unique_id": "ab:cd:ef:12:a5:49:dd:25:35:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a5:49:dd:25", "endpoint_id": 35, "available": true, diff --git a/tests/data/devices/frient-a-s-moszb-153.json b/tests/data/devices/frient-a-s-moszb-153.json index b9a06b7b7..d3364789e 100644 --- a/tests/data/devices/frient-a-s-moszb-153.json +++ b/tests/data/devices/frient-a-s-moszb-153.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:1a:10:8a:e5", "nwk": "0x45DF", "manufacturer": "frient A/S", @@ -548,22 +548,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 34, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "34:0x0406", - "unique_id": "00:15:bc:00:1a:10:8a:e5:34:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "00:15:bc:00:1a:10:8a:e5", "endpoint_id": 34, "available": true, @@ -591,22 +575,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 35, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "35:0x0500", - "unique_id": "00:15:bc:00:1a:10:8a:e5:35:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1a:10:8a:e5", "endpoint_id": 35, "available": true, @@ -636,22 +604,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 34, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "34:0x0003", - "unique_id": "00:15:bc:00:1a:10:8a:e5:34:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1a:10:8a:e5", "endpoint_id": 34, "available": true, @@ -684,22 +636,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 34, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "34:0x0406", - "unique_id": "00:15:bc:00:1a:10:8a:e5:34:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "00:15:bc:00:1a:10:8a:e5", "endpoint_id": 34, "available": true, @@ -731,22 +667,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 35, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "35:0x0500", - "unique_id": "00:15:bc:00:1a:10:8a:e5:35:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1a:10:8a:e5", "endpoint_id": 35, "available": true, @@ -780,22 +700,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 34, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "34:0x0000", - "unique_id": "00:15:bc:00:1a:10:8a:e5:34:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1a:10:8a:e5", "endpoint_id": 34, "available": true, @@ -824,22 +728,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 34, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "34:0x0000", - "unique_id": "00:15:bc:00:1a:10:8a:e5:34:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1a:10:8a:e5", "endpoint_id": 34, "available": true, @@ -868,22 +756,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 35, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "35:0x0001", - "unique_id": "00:15:bc:00:1a:10:8a:e5:35:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:bc:00:1a:10:8a:e5", "endpoint_id": 35, "available": true, @@ -920,22 +792,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 38, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "38:0x0402", - "unique_id": "00:15:bc:00:1a:10:8a:e5:38:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:bc:00:1a:10:8a:e5", "endpoint_id": 38, "available": true, @@ -964,22 +820,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 39, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "39:0x0400", - "unique_id": "00:15:bc:00:1a:10:8a:e5:39:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:bc:00:1a:10:8a:e5", "endpoint_id": 39, "available": true, @@ -1010,22 +850,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 35, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "35:0x0019_client", - "unique_id": "00:15:bc:00:1a:10:8a:e5:35:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:1a:10:8a:e5", "endpoint_id": 35, "available": true, diff --git a/tests/data/devices/frient-a-s-sbtzb-110.json b/tests/data/devices/frient-a-s-sbtzb-110.json index 28d66634c..d5e724cb4 100644 --- a/tests/data/devices/frient-a-s-sbtzb-110.json +++ b/tests/data/devices/frient-a-s-sbtzb-110.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:39:00:52:cd", "nwk": "0x2B3E", "manufacturer": "frient A/S", @@ -265,22 +265,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 32, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "32:0x000f", - "unique_id": "00:15:bc:00:39:00:52:cd:32:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:15:bc:00:39:00:52:cd", "endpoint_id": 32, "available": true, @@ -310,22 +294,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 32, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "32:0x0003", - "unique_id": "00:15:bc:00:39:00:52:cd:32:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:39:00:52:cd", "endpoint_id": 32, "available": true, @@ -358,22 +326,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 32, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "32:0x0000", - "unique_id": "00:15:bc:00:39:00:52:cd:32:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:39:00:52:cd", "endpoint_id": 32, "available": true, @@ -402,22 +354,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 32, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "32:0x0000", - "unique_id": "00:15:bc:00:39:00:52:cd:32:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:39:00:52:cd", "endpoint_id": 32, "available": true, @@ -446,22 +382,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 32, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "32:0x0001", - "unique_id": "00:15:bc:00:39:00:52:cd:32:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:bc:00:39:00:52:cd", "endpoint_id": 32, "available": true, @@ -500,22 +420,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 32, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "32:0x0019_client", - "unique_id": "00:15:bc:00:39:00:52:cd:32:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:39:00:52:cd", "endpoint_id": 32, "available": true, diff --git a/tests/data/devices/frient-a-s-scazb-141.json b/tests/data/devices/frient-a-s-scazb-141.json index b5fddc1f0..0554309b1 100644 --- a/tests/data/devices/frient-a-s-scazb-141.json +++ b/tests/data/devices/frient-a-s-scazb-141.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:18:f2:e7:e6", "nwk": "0xEA73", "manufacturer": "frient A/S", @@ -480,22 +480,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 35, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "35:0x0500", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:35:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 35, "available": true, @@ -523,22 +507,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 35, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "35:0x0500", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:35:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 35, "available": true, @@ -566,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 35, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "35:0x0500", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:35:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 35, "available": true, @@ -609,22 +561,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 46, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "46:0x0500", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:46:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 46, "available": true, @@ -654,22 +590,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 35, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "35:0x0003", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:35:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 35, "available": true, @@ -702,22 +622,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 35, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "35:0x0000", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:35:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 35, "available": true, @@ -746,22 +650,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 35, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "35:0x0000", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:35:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 35, "available": true, @@ -790,22 +678,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 35, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "35:0x0001", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:35:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 35, "available": true, @@ -842,22 +714,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 38, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "38:0x0402", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:38:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 38, "available": true, @@ -886,22 +742,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "CarbonMonoxideConcentrationClusterHandler", - "generic_id": "cluster_handler_0x040c", - "endpoint_id": 46, - "cluster": { - "id": 1036, - "name": "Carbon Monoxide (CO) Concentration", - "type": "server" - }, - "id": "46:0x040c", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:46:0x040c", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 46, "available": true, @@ -932,22 +772,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 35, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "35:0x0502", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:35:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 35, "available": true, @@ -978,22 +802,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 35, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "35:0x0019_client", - "unique_id": "ab:cd:ef:12:18:f2:e7:e6:35:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:18:f2:e7:e6", "endpoint_id": 35, "available": true, diff --git a/tests/data/devices/frient-a-s-sirzb-111.json b/tests/data/devices/frient-a-s-sirzb-111.json index dd19cc1a8..397b941be 100644 --- a/tests/data/devices/frient-a-s-sirzb-111.json +++ b/tests/data/devices/frient-a-s-sirzb-111.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:41:00:6f:8e", "nwk": "0x7FDB", "manufacturer": "frient A/S", @@ -289,22 +289,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 43, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "43:0x0003", - "unique_id": "00:15:bc:00:41:00:6f:8e:43:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:41:00:6f:8e", "endpoint_id": 43, "available": true, @@ -337,22 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 43, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "43:0x0502", - "unique_id": "00:15:bc:00:41:00:6f:8e:43:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:41:00:6f:8e", "endpoint_id": 43, "available": true, @@ -386,22 +354,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 43, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "43:0x0502", - "unique_id": "00:15:bc:00:41:00:6f:8e:43:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:41:00:6f:8e", "endpoint_id": 43, "available": true, @@ -433,22 +385,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 43, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "43:0x0502", - "unique_id": "00:15:bc:00:41:00:6f:8e:43:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:41:00:6f:8e", "endpoint_id": 43, "available": true, @@ -482,22 +418,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 43, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "43:0x0502", - "unique_id": "00:15:bc:00:41:00:6f:8e:43:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:41:00:6f:8e", "endpoint_id": 43, "available": true, @@ -536,22 +456,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 43, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "43:0x0000", - "unique_id": "00:15:bc:00:41:00:6f:8e:43:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:41:00:6f:8e", "endpoint_id": 43, "available": true, @@ -580,22 +484,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 43, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "43:0x0000", - "unique_id": "00:15:bc:00:41:00:6f:8e:43:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:41:00:6f:8e", "endpoint_id": 43, "available": true, @@ -624,22 +512,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 43, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "43:0x0001", - "unique_id": "00:15:bc:00:41:00:6f:8e:43:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:bc:00:41:00:6f:8e", "endpoint_id": 43, "available": true, @@ -670,22 +542,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 43, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "43:0x0502", - "unique_id": "00:15:bc:00:41:00:6f:8e:43:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:41:00:6f:8e", "endpoint_id": 43, "available": true, @@ -723,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 43, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "43:0x0019_client", - "unique_id": "00:15:bc:00:41:00:6f:8e:43:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:41:00:6f:8e", "endpoint_id": 43, "available": true, diff --git a/tests/data/devices/frient-a-s-smszb-120.json b/tests/data/devices/frient-a-s-smszb-120.json index 27a28c73b..e1890ccdf 100644 --- a/tests/data/devices/frient-a-s-smszb-120.json +++ b/tests/data/devices/frient-a-s-smszb-120.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:31:01:f8:92", "nwk": "0x614F", "manufacturer": "frient A/S", @@ -338,22 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 35, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "35:0x0500", - "unique_id": "00:15:bc:00:31:01:f8:92:35:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:31:01:f8:92", "endpoint_id": 35, "available": true, @@ -383,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 35, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "35:0x0003", - "unique_id": "00:15:bc:00:31:01:f8:92:35:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:31:01:f8:92", "endpoint_id": 35, "available": true, @@ -431,22 +399,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 35, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "35:0x0000", - "unique_id": "00:15:bc:00:31:01:f8:92:35:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:31:01:f8:92", "endpoint_id": 35, "available": true, @@ -475,22 +427,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 35, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "35:0x0000", - "unique_id": "00:15:bc:00:31:01:f8:92:35:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:31:01:f8:92", "endpoint_id": 35, "available": true, @@ -519,22 +455,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 35, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "35:0x0001", - "unique_id": "00:15:bc:00:31:01:f8:92:35:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:bc:00:31:01:f8:92", "endpoint_id": 35, "available": true, @@ -571,22 +491,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 38, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "38:0x0402", - "unique_id": "00:15:bc:00:31:01:f8:92:38:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:bc:00:31:01:f8:92", "endpoint_id": 38, "available": true, @@ -617,22 +521,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 35, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "35:0x0502", - "unique_id": "00:15:bc:00:31:01:f8:92:35:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:31:01:f8:92", "endpoint_id": 35, "available": true, @@ -663,22 +551,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 35, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "35:0x0019_client", - "unique_id": "00:15:bc:00:31:01:f8:92:35:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:31:01:f8:92", "endpoint_id": 35, "available": true, diff --git a/tests/data/devices/frient-a-s-splzb-141.json b/tests/data/devices/frient-a-s-splzb-141.json index ee19b6ec7..e3067b1b4 100644 --- a/tests/data/devices/frient-a-s-splzb-141.json +++ b/tests/data/devices/frient-a-s-splzb-141.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:2f:02:19:79", "nwk": "0x3E8F", "manufacturer": "frient A/S", @@ -576,22 +576,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 2, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "2:0x0003", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, @@ -624,22 +608,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, @@ -668,22 +636,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, @@ -712,22 +664,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, @@ -764,22 +700,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, @@ -816,22 +736,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 2, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "2:0x0002", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, @@ -851,7 +755,7 @@ "unique_id": "00:15:bc:00:2f:02:19:79-2-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -860,22 +764,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, @@ -884,7 +772,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 2.0, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -909,22 +797,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, @@ -958,22 +830,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, @@ -1008,22 +864,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, @@ -1060,22 +900,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, @@ -1104,22 +928,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "00:15:bc:00:2f:02:19:79:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:2f:02:19:79", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/frient-a-s-wiszb-131.json b/tests/data/devices/frient-a-s-wiszb-131.json index f9dfd8d09..b1bf60d3d 100644 --- a/tests/data/devices/frient-a-s-wiszb-131.json +++ b/tests/data/devices/frient-a-s-wiszb-131.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:bc:00:44:01:11:f9", "nwk": "0x336F", "manufacturer": "frient A/S", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 35, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "35:0x0500", - "unique_id": "00:15:bc:00:44:01:11:f9:35:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:44:01:11:f9", "endpoint_id": 35, "available": true, @@ -379,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 35, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "35:0x0500", - "unique_id": "00:15:bc:00:44:01:11:f9:35:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:44:01:11:f9", "endpoint_id": 35, "available": true, @@ -424,22 +392,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 35, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "35:0x0003", - "unique_id": "00:15:bc:00:44:01:11:f9:35:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:44:01:11:f9", "endpoint_id": 35, "available": true, @@ -472,22 +424,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 35, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "35:0x0000", - "unique_id": "00:15:bc:00:44:01:11:f9:35:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:44:01:11:f9", "endpoint_id": 35, "available": true, @@ -516,22 +452,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 35, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "35:0x0000", - "unique_id": "00:15:bc:00:44:01:11:f9:35:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:44:01:11:f9", "endpoint_id": 35, "available": true, @@ -560,22 +480,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 35, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "35:0x0001", - "unique_id": "00:15:bc:00:44:01:11:f9:35:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:bc:00:44:01:11:f9", "endpoint_id": 35, "available": true, @@ -612,22 +516,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 38, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "38:0x0402", - "unique_id": "00:15:bc:00:44:01:11:f9:38:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:bc:00:44:01:11:f9", "endpoint_id": 38, "available": true, @@ -658,22 +546,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 35, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "35:0x0019_client", - "unique_id": "00:15:bc:00:44:01:11:f9:35:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:bc:00:44:01:11:f9", "endpoint_id": 35, "available": true, diff --git a/tests/data/devices/generic-zigbee-coordinator-ezsp.json b/tests/data/devices/generic-zigbee-coordinator-ezsp.json index 8c8482b7a..9ec198e16 100644 --- a/tests/data/devices/generic-zigbee-coordinator-ezsp.json +++ b/tests/data/devices/generic-zigbee-coordinator-ezsp.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:90:34:24:63", "nwk": "0x0000", "manufacturer": "", diff --git a/tests/data/devices/gledopto-gl-b-008p.json b/tests/data/devices/gledopto-gl-b-008p.json index 4201f42ec..ffe8334fc 100644 --- a/tests/data/devices/gledopto-gl-b-008p.json +++ b/tests/data/devices/gledopto-gl-b-008p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "68:0a:e2:ff:fe:d6:1e:ab", "nwk": "0x92D1", "manufacturer": "GLEDOPTO", @@ -354,22 +354,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "68:0a:e2:ff:fe:d6:1e:ab:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:d6:1e:ab", "endpoint_id": 11, "available": true, @@ -402,50 +386,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "68:0a:e2:ff:fe:d6:1e:ab:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "68:0a:e2:ff:fe:d6:1e:ab:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "68:0a:e2:ff:fe:d6:1e:ab:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "68:0a:e2:ff:fe:d6:1e:ab", "endpoint_id": 11, "available": true, @@ -506,22 +446,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "68:0a:e2:ff:fe:d6:1e:ab:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "68:0a:e2:ff:fe:d6:1e:ab", "endpoint_id": 11, "available": true, @@ -553,22 +477,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "68:0a:e2:ff:fe:d6:1e:ab:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "68:0a:e2:ff:fe:d6:1e:ab", "endpoint_id": 11, "available": true, @@ -602,22 +510,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "68:0a:e2:ff:fe:d6:1e:ab:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "68:0a:e2:ff:fe:d6:1e:ab", "endpoint_id": 11, "available": true, @@ -653,22 +545,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "68:0a:e2:ff:fe:d6:1e:ab:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:d6:1e:ab", "endpoint_id": 11, "available": true, @@ -697,22 +573,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "68:0a:e2:ff:fe:d6:1e:ab:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:d6:1e:ab", "endpoint_id": 11, "available": true, @@ -743,22 +603,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "68:0a:e2:ff:fe:d6:1e:ab:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:d6:1e:ab", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/gledopto-gl-b-008z.json b/tests/data/devices/gledopto-gl-b-008z.json index 59c943653..a58e2a38d 100644 --- a/tests/data/devices/gledopto-gl-b-008z.json +++ b/tests/data/devices/gledopto-gl-b-008z.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:80:5a:bb:1b", "nwk": "0x0A04", "manufacturer": "GLEDOPTO", @@ -267,22 +267,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:80:5a:bb:1b:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:80:5a:bb:1b", "endpoint_id": 11, "available": true, @@ -315,50 +299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:80:5a:bb:1b:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:80:5a:bb:1b:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:80:5a:bb:1b:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:80:5a:bb:1b", "endpoint_id": 11, "available": true, @@ -419,22 +359,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:80:5a:bb:1b:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:80:5a:bb:1b", "endpoint_id": 11, "available": true, @@ -463,22 +387,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:80:5a:bb:1b:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:80:5a:bb:1b", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/gledopto-gl-c-009p.json b/tests/data/devices/gledopto-gl-c-009p.json index 41c3dc668..85f9c57af 100644 --- a/tests/data/devices/gledopto-gl-c-009p.json +++ b/tests/data/devices/gledopto-gl-c-009p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8c:97:e8:62", "nwk": "0x26A7", "manufacturer": "GLEDOPTO", @@ -217,22 +217,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:8c:97:e8:62:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:97:e8:62", "endpoint_id": 11, "available": true, @@ -265,36 +249,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:8c:97:e8:62:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:8c:97:e8:62:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:8c:97:e8:62", "endpoint_id": 11, "available": true, @@ -348,22 +302,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:8c:97:e8:62:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:8c:97:e8:62", "endpoint_id": 11, "available": true, @@ -397,22 +335,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:8c:97:e8:62:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:8c:97:e8:62", "endpoint_id": 11, "available": true, @@ -448,22 +370,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:8c:97:e8:62:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:97:e8:62", "endpoint_id": 11, "available": true, @@ -492,22 +398,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:8c:97:e8:62:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:97:e8:62", "endpoint_id": 11, "available": true, @@ -538,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:8c:97:e8:62:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:97:e8:62", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/gledopto-gl-sd-301p.json b/tests/data/devices/gledopto-gl-sd-301p.json index af3383d89..cb5b5da6d 100644 --- a/tests/data/devices/gledopto-gl-sd-301p.json +++ b/tests/data/devices/gledopto-gl-sd-301p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:40:cb:4a:aa", "nwk": "0x0579", "manufacturer": "GLEDOPTO", @@ -306,22 +306,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:40:cb:4a:aa:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cb:4a:aa", "endpoint_id": 11, "available": true, @@ -354,50 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:40:cb:4a:aa:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:40:cb:4a:aa:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:40:cb:4a:aa:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:40:cb:4a:aa", "endpoint_id": 11, "available": true, @@ -452,22 +392,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:40:cb:4a:aa:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:40:cb:4a:aa", "endpoint_id": 11, "available": true, @@ -499,22 +423,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:40:cb:4a:aa:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:40:cb:4a:aa", "endpoint_id": 11, "available": true, @@ -548,22 +456,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:40:cb:4a:aa:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:40:cb:4a:aa", "endpoint_id": 11, "available": true, @@ -599,22 +491,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:40:cb:4a:aa:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cb:4a:aa", "endpoint_id": 11, "available": true, @@ -643,22 +519,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:40:cb:4a:aa:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cb:4a:aa", "endpoint_id": 11, "available": true, @@ -689,22 +549,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:40:cb:4a:aa:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cb:4a:aa", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/gledpopto-gl-c-007p.json b/tests/data/devices/gledpopto-gl-c-007p.json index 7c82bcf6f..764270c7e 100644 --- a/tests/data/devices/gledpopto-gl-c-007p.json +++ b/tests/data/devices/gledpopto-gl-c-007p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ce:0d:48:29", "nwk": "0x57B2", "manufacturer": "GLEDPOPTO", @@ -366,22 +366,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:ce:0d:48:29:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:0d:48:29", "endpoint_id": 11, "available": true, @@ -414,50 +398,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:ce:0d:48:29:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:ce:0d:48:29:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:ce:0d:48:29:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:ce:0d:48:29", "endpoint_id": 11, "available": true, @@ -518,22 +458,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:ce:0d:48:29:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:ce:0d:48:29", "endpoint_id": 11, "available": true, @@ -565,22 +489,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:ce:0d:48:29:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ce:0d:48:29", "endpoint_id": 11, "available": true, @@ -614,22 +522,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:ce:0d:48:29:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ce:0d:48:29", "endpoint_id": 11, "available": true, @@ -665,22 +557,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:ce:0d:48:29:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:0d:48:29", "endpoint_id": 11, "available": true, @@ -709,22 +585,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:ce:0d:48:29:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:0d:48:29", "endpoint_id": 11, "available": true, @@ -755,22 +615,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:ce:0d:48:29:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:0d:48:29", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/handshake-finland-agge-zigbee-smart-rotary-dimmer.json b/tests/data/devices/handshake-finland-agge-zigbee-smart-rotary-dimmer.json index 1c92c926f..e1898f823 100644 --- a/tests/data/devices/handshake-finland-agge-zigbee-smart-rotary-dimmer.json +++ b/tests/data/devices/handshake-finland-agge-zigbee-smart-rotary-dimmer.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:45:62:b6:0e", "nwk": "0x5A2D", "manufacturer": "Handshake Finland", @@ -251,22 +251,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:45:62:b6:0e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:45:62:b6:0e", "endpoint_id": 1, "available": true, @@ -299,36 +283,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:45:62:b6:0e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:45:62:b6:0e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:45:62:b6:0e", "endpoint_id": 1, "available": true, @@ -382,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:45:62:b6:0e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:45:62:b6:0e", "endpoint_id": 1, "available": true, @@ -431,22 +369,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:45:62:b6:0e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:45:62:b6:0e", "endpoint_id": 1, "available": true, @@ -475,22 +397,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:45:62:b6:0e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:45:62:b6:0e", "endpoint_id": 1, "available": true, @@ -521,22 +427,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:45:62:b6:0e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:45:62:b6:0e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/heiman-smokesensor-em.json b/tests/data/devices/heiman-smokesensor-em.json index 12e3611b6..c8a15fea3 100644 --- a/tests/data/devices/heiman-smokesensor-em.json +++ b/tests/data/devices/heiman-smokesensor-em.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5b:49:00:53", "nwk": "0x0ED6", "manufacturer": "HEIMAN", @@ -195,22 +195,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:5b:49:00:53:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:49:00:53", "endpoint_id": 1, "available": true, @@ -240,22 +224,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:5b:49:00:53:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:49:00:53", "endpoint_id": 1, "available": true, @@ -288,22 +256,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5b:49:00:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:49:00:53", "endpoint_id": 1, "available": true, @@ -332,22 +284,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5b:49:00:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:49:00:53", "endpoint_id": 1, "available": true, @@ -376,22 +312,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:5b:49:00:53:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:5b:49:00:53", "endpoint_id": 1, "available": true, @@ -428,22 +348,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5b:49:00:53:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:49:00:53", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/hive-mbr1.json b/tests/data/devices/hive-mbr1.json index fa47ba913..3c3184bf0 100644 --- a/tests/data/devices/hive-mbr1.json +++ b/tests/data/devices/hive-mbr1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1c:d0:af:c8", "nwk": "0xBE3E", "manufacturer": "Hive", @@ -480,22 +480,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:1c:d0:af:c8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1c:d0:af:c8", "endpoint_id": 1, "available": true, @@ -528,22 +512,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1c:d0:af:c8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1c:d0:af:c8", "endpoint_id": 1, "available": true, @@ -572,22 +540,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1c:d0:af:c8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1c:d0:af:c8", "endpoint_id": 1, "available": true, @@ -618,22 +570,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1c:d0:af:c8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1c:d0:af:c8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/hobeian-zg-101zl.json b/tests/data/devices/hobeian-zg-101zl.json index fce7037d4..8f14a7ec7 100644 --- a/tests/data/devices/hobeian-zg-101zl.json +++ b/tests/data/devices/hobeian-zg-101zl.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:41:15:95:9c", "nwk": "0x0224", "manufacturer": "HOBEIAN", @@ -401,22 +401,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:41:15:95:9c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:41:15:95:9c", "endpoint_id": 1, "available": true, @@ -449,22 +433,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:41:15:95:9c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:41:15:95:9c", "endpoint_id": 1, "available": true, @@ -500,22 +468,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:41:15:95:9c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:41:15:95:9c", "endpoint_id": 1, "available": true, @@ -544,22 +496,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:41:15:95:9c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:41:15:95:9c", "endpoint_id": 1, "available": true, @@ -588,22 +524,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:41:15:95:9c:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:41:15:95:9c", "endpoint_id": 1, "available": true, @@ -640,22 +560,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:41:15:95:9c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:41:15:95:9c", "endpoint_id": 1, "available": true, @@ -684,22 +588,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:41:15:95:9c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:41:15:95:9c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/hobeian-zg-102zm.json b/tests/data/devices/hobeian-zg-102zm.json index a1e69f758..72bb7bfe0 100644 --- a/tests/data/devices/hobeian-zg-102zm.json +++ b/tests/data/devices/hobeian-zg-102zm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:be:26:37:f4", "nwk": "0xCEF6", "manufacturer": "HOBEIAN", @@ -192,22 +192,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:be:26:37:f4:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:26:37:f4", "endpoint_id": 1, "available": true, @@ -237,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:be:26:37:f4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:26:37:f4", "endpoint_id": 1, "available": true, @@ -285,22 +253,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:be:26:37:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:26:37:f4", "endpoint_id": 1, "available": true, @@ -329,22 +281,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:be:26:37:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:26:37:f4", "endpoint_id": 1, "available": true, @@ -373,22 +309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:be:26:37:f4:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:be:26:37:f4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/hobeian-zg-204zk.json b/tests/data/devices/hobeian-zg-204zk.json index 836df9309..b8db1c41c 100644 --- a/tests/data/devices/hobeian-zg-204zk.json +++ b/tests/data/devices/hobeian-zg-204zk.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:32:4e:24:ab", "nwk": "0x06DF", "manufacturer": "HOBEIAN", @@ -211,22 +211,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:32:4e:24:ab:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:4e:24:ab", "endpoint_id": 1, "available": true, @@ -256,22 +240,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:32:4e:24:ab:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:4e:24:ab", "endpoint_id": 1, "available": true, @@ -304,22 +272,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:32:4e:24:ab:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:4e:24:ab", "endpoint_id": 1, "available": true, @@ -348,22 +300,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:32:4e:24:ab:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:4e:24:ab", "endpoint_id": 1, "available": true, @@ -392,22 +328,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:32:4e:24:ab:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:32:4e:24:ab", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/hobeian-zg-204zv.json b/tests/data/devices/hobeian-zg-204zv.json index 8427b091f..d05a81cd9 100644 --- a/tests/data/devices/hobeian-zg-204zv.json +++ b/tests/data/devices/hobeian-zg-204zv.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d9:4b:d8:42", "nwk": "0xAF28", "manufacturer": "HOBEIAN", @@ -239,22 +239,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:d9:4b:d8:42:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:4b:d8:42", "endpoint_id": 1, "available": true, @@ -284,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d9:4b:d8:42:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:4b:d8:42", "endpoint_id": 1, "available": true, @@ -332,22 +300,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d9:4b:d8:42:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:4b:d8:42", "endpoint_id": 1, "available": true, @@ -376,22 +328,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d9:4b:d8:42:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:4b:d8:42", "endpoint_id": 1, "available": true, @@ -420,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:d9:4b:d8:42:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:d9:4b:d8:42", "endpoint_id": 1, "available": true, @@ -470,22 +390,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:d9:4b:d8:42:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d9:4b:d8:42", "endpoint_id": 1, "available": true, @@ -514,22 +418,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:d9:4b:d8:42:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d9:4b:d8:42", "endpoint_id": 1, "available": true, @@ -558,22 +446,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:d9:4b:d8:42:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d9:4b:d8:42", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/hobeian-zg-229z.json b/tests/data/devices/hobeian-zg-229z.json index 445630437..f704b0e06 100644 --- a/tests/data/devices/hobeian-zg-229z.json +++ b/tests/data/devices/hobeian-zg-229z.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:da:48:c9:d3", "nwk": "0x0FE7", "manufacturer": "HOBEIAN", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:da:48:c9:d3:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:da:48:c9:d3", "endpoint_id": 1, "available": true, @@ -231,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:da:48:c9:d3:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:da:48:c9:d3", "endpoint_id": 1, "available": true, @@ -299,22 +267,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:da:48:c9:d3:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:da:48:c9:d3", "endpoint_id": 1, "available": true, @@ -350,22 +302,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:da:48:c9:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:da:48:c9:d3", "endpoint_id": 1, "available": true, @@ -394,22 +330,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:da:48:c9:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:da:48:c9:d3", "endpoint_id": 1, "available": true, @@ -438,22 +358,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:da:48:c9:d3:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:da:48:c9:d3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/homr-hrmsn01.json b/tests/data/devices/homr-hrmsn01.json index 317046451..d14dfabf7 100644 --- a/tests/data/devices/homr-hrmsn01.json +++ b/tests/data/devices/homr-hrmsn01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "f4:ce:36:f8:ec:e4:c3:5d", "nwk": "0x95C0", "manufacturer": "Homr", @@ -427,22 +427,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -472,22 +456,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -520,50 +488,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 10, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "10:0x0006", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:10:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 10, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "10:0x0008", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:10:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 10, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "10:0x0300", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:10:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 10, "available": true, @@ -622,22 +546,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 10, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "10:0x0300", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:10:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 10, "available": true, @@ -671,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -720,22 +612,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -767,22 +643,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -816,22 +676,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -870,22 +714,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -914,22 +742,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -958,22 +770,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -1002,22 +798,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -1046,22 +826,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PressureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0403", - "endpoint_id": 1, - "cluster": { - "id": 1027, - "name": "Pressure Measurement", - "type": "server" - }, - "id": "1:0x0403", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0403", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -1090,22 +854,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -1136,22 +884,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 1, "available": true, @@ -1189,22 +921,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 5, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "5:0x0019_client", - "unique_id": "f4:ce:36:f8:ec:e4:c3:5d:5:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:f8:ec:e4:c3:5d", "endpoint_id": 5, "available": true, diff --git a/tests/data/devices/horn-zone-haier-hs-22zw-0000011216.json b/tests/data/devices/horn-zone-haier-hs-22zw-0000011216.json index 986d0cc0d..473c98318 100644 --- a/tests/data/devices/horn-zone-haier-hs-22zw-0000011216.json +++ b/tests/data/devices/horn-zone-haier-hs-22zw-0000011216.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e2:16:2d:16", "nwk": "0x9E37", "manufacturer": "HORN-ZONE-HAIER ", @@ -136,22 +136,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:e2:16:2d:16:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e2:16:2d:16", "endpoint_id": 1, "available": true, @@ -181,22 +165,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e2:16:2d:16:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e2:16:2d:16", "endpoint_id": 1, "available": true, @@ -229,22 +197,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e2:16:2d:16:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e2:16:2d:16", "endpoint_id": 1, "available": true, @@ -273,22 +225,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e2:16:2d:16:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e2:16:2d:16", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-badring-water-leakage-sensor.json b/tests/data/devices/ikea-of-sweden-badring-water-leakage-sensor.json index 4573d8a48..5ea4f4e6e 100644 --- a/tests/data/devices/ikea-of-sweden-badring-water-leakage-sensor.json +++ b/tests/data/devices/ikea-of-sweden-badring-water-leakage-sensor.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:81:d7:c3:57", "nwk": "0x92DD", "manufacturer": "IKEA of Sweden", @@ -244,22 +244,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:81:d7:c3:57:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:d7:c3:57", "endpoint_id": 1, "available": true, @@ -289,22 +273,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:81:d7:c3:57:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:d7:c3:57", "endpoint_id": 1, "available": true, @@ -337,22 +305,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:81:d7:c3:57:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:d7:c3:57", "endpoint_id": 1, "available": true, @@ -381,22 +333,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:81:d7:c3:57:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:d7:c3:57", "endpoint_id": 1, "available": true, @@ -425,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:81:d7:c3:57:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:81:d7:c3:57", "endpoint_id": 1, "available": true, @@ -479,22 +399,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:81:d7:c3:57:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:d7:c3:57", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-fyrtur-block-out-roller-blind.json b/tests/data/devices/ikea-of-sweden-fyrtur-block-out-roller-blind.json index 2c350de63..ce8dd274f 100644 --- a/tests/data/devices/ikea-of-sweden-fyrtur-block-out-roller-blind.json +++ b/tests/data/devices/ikea-of-sweden-fyrtur-block-out-roller-blind.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "f4:b3:b1:ff:fe:8c:5a:5f", "nwk": "0xC976", "manufacturer": "IKEA of Sweden", @@ -277,22 +277,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "f4:b3:b1:ff:fe:8c:5a:5f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:b3:b1:ff:fe:8c:5a:5f", "endpoint_id": 1, "available": true, @@ -325,22 +309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "f4:b3:b1:ff:fe:8c:5a:5f:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "f4:b3:b1:ff:fe:8c:5a:5f", "endpoint_id": 1, "available": true, @@ -375,22 +343,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f4:b3:b1:ff:fe:8c:5a:5f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:b3:b1:ff:fe:8c:5a:5f", "endpoint_id": 1, "available": true, @@ -419,22 +371,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f4:b3:b1:ff:fe:8c:5a:5f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:b3:b1:ff:fe:8c:5a:5f", "endpoint_id": 1, "available": true, @@ -463,22 +399,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "f4:b3:b1:ff:fe:8c:5a:5f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "f4:b3:b1:ff:fe:8c:5a:5f", "endpoint_id": 1, "available": true, @@ -513,22 +433,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "f4:b3:b1:ff:fe:8c:5a:5f:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "f4:b3:b1:ff:fe:8c:5a:5f", "endpoint_id": 1, "available": true, @@ -559,22 +463,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "f4:b3:b1:ff:fe:8c:5a:5f:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "f4:b3:b1:ff:fe:8c:5a:5f", "endpoint_id": 1, "available": true, @@ -609,22 +497,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "f4:b3:b1:ff:fe:8c:5a:5f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:b3:b1:ff:fe:8c:5a:5f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-inspelning-smart-plug.json b/tests/data/devices/ikea-of-sweden-inspelning-smart-plug.json index 405dc461b..8a5ecd108 100644 --- a/tests/data/devices/ikea-of-sweden-inspelning-smart-plug.json +++ b/tests/data/devices/ikea-of-sweden-inspelning-smart-plug.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "d4:48:67:ff:fe:13:d6:f8", "nwk": "0x80A8", "manufacturer": "IKEA of Sweden", @@ -530,22 +530,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, @@ -578,22 +562,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, @@ -629,22 +597,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, @@ -673,22 +625,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, @@ -717,22 +653,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, @@ -760,7 +680,7 @@ "unique_id": "d4:48:67:ff:fe:13:d6:f8-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "ReportingElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -769,22 +689,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, @@ -793,7 +697,7 @@ "unit": "W" }, "state": { - "class_name": "ReportingElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -818,22 +722,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, @@ -867,22 +755,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, @@ -918,22 +790,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, @@ -960,22 +816,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc85", - "endpoint_id": 1, - "cluster": { - "id": 64645, - "name": "IkeaSmartPlugCluster", - "type": "server" - }, - "id": "1:0xfc85", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0xfc85", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, @@ -1008,22 +848,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc85", - "endpoint_id": 1, - "cluster": { - "id": 64645, - "name": "IkeaSmartPlugCluster", - "type": "server" - }, - "id": "1:0xfc85", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0xfc85", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, @@ -1058,22 +882,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "d4:48:67:ff:fe:13:d6:f8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "d4:48:67:ff:fe:13:d6:f8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-ormanas-led-strip.json b/tests/data/devices/ikea-of-sweden-ormanas-led-strip.json index 56adae471..b0aa0bfc7 100644 --- a/tests/data/devices/ikea-of-sweden-ormanas-led-strip.json +++ b/tests/data/devices/ikea-of-sweden-ormanas-led-strip.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:96:7e:63:8a", "nwk": "0x9812", "manufacturer": "IKEA of Sweden", @@ -447,22 +447,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:96:7e:63:8a", "endpoint_id": 1, "available": true, @@ -495,50 +479,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:96:7e:63:8a", "endpoint_id": 1, "available": true, @@ -599,22 +539,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:96:7e:63:8a", "endpoint_id": 1, "available": true, @@ -646,22 +570,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:96:7e:63:8a", "endpoint_id": 1, "available": true, @@ -693,22 +601,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:96:7e:63:8a", "endpoint_id": 1, "available": true, @@ -740,22 +632,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:96:7e:63:8a", "endpoint_id": 1, "available": true, @@ -789,22 +665,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:96:7e:63:8a", "endpoint_id": 1, "available": true, @@ -840,22 +700,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:96:7e:63:8a", "endpoint_id": 1, "available": true, @@ -884,22 +728,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:96:7e:63:8a", "endpoint_id": 1, "available": true, @@ -930,22 +758,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:96:7e:63:8a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:96:7e:63:8a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-parasoll-door-window-sensor.json b/tests/data/devices/ikea-of-sweden-parasoll-door-window-sensor.json index 77f33d378..b91202680 100644 --- a/tests/data/devices/ikea-of-sweden-parasoll-door-window-sensor.json +++ b/tests/data/devices/ikea-of-sweden-parasoll-door-window-sensor.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "04:87:27:ff:fe:4a:b3:25", "nwk": "0xD4C9", "manufacturer": "IKEA of Sweden", @@ -299,22 +299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 2, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "2:0x0500", - "unique_id": "04:87:27:ff:fe:4a:b3:25:2:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:87:27:ff:fe:4a:b3:25", "endpoint_id": 2, "available": true, @@ -344,22 +328,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "04:87:27:ff:fe:4a:b3:25:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:87:27:ff:fe:4a:b3:25", "endpoint_id": 1, "available": true, @@ -392,22 +360,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:87:27:ff:fe:4a:b3:25:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:87:27:ff:fe:4a:b3:25", "endpoint_id": 1, "available": true, @@ -436,22 +388,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:87:27:ff:fe:4a:b3:25:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:87:27:ff:fe:4a:b3:25", "endpoint_id": 1, "available": true, @@ -480,22 +416,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "04:87:27:ff:fe:4a:b3:25:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "04:87:27:ff:fe:4a:b3:25", "endpoint_id": 1, "available": true, @@ -534,22 +454,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "04:87:27:ff:fe:4a:b3:25:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:87:27:ff:fe:4a:b3:25", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-praktlysing-cellular-blind.json b/tests/data/devices/ikea-of-sweden-praktlysing-cellular-blind.json index 944eeb744..f5367d5c1 100644 --- a/tests/data/devices/ikea-of-sweden-praktlysing-cellular-blind.json +++ b/tests/data/devices/ikea-of-sweden-praktlysing-cellular-blind.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "bc:02:6e:ff:fe:5e:af:fd", "nwk": "0xE8FD", "manufacturer": "IKEA of Sweden", @@ -284,22 +284,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "bc:02:6e:ff:fe:5e:af:fd:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "bc:02:6e:ff:fe:5e:af:fd", "endpoint_id": 1, "available": true, @@ -332,22 +316,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "bc:02:6e:ff:fe:5e:af:fd:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "bc:02:6e:ff:fe:5e:af:fd", "endpoint_id": 1, "available": true, @@ -382,22 +350,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "bc:02:6e:ff:fe:5e:af:fd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "bc:02:6e:ff:fe:5e:af:fd", "endpoint_id": 1, "available": true, @@ -426,22 +378,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "bc:02:6e:ff:fe:5e:af:fd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "bc:02:6e:ff:fe:5e:af:fd", "endpoint_id": 1, "available": true, @@ -470,22 +406,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "bc:02:6e:ff:fe:5e:af:fd:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "bc:02:6e:ff:fe:5e:af:fd", "endpoint_id": 1, "available": true, @@ -520,22 +440,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "bc:02:6e:ff:fe:5e:af:fd:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "bc:02:6e:ff:fe:5e:af:fd", "endpoint_id": 1, "available": true, @@ -566,22 +470,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "bc:02:6e:ff:fe:5e:af:fd:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "bc:02:6e:ff:fe:5e:af:fd", "endpoint_id": 1, "available": true, @@ -616,22 +504,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "bc:02:6e:ff:fe:5e:af:fd:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "bc:02:6e:ff:fe:5e:af:fd", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-remote-control-n2.json b/tests/data/devices/ikea-of-sweden-remote-control-n2.json index 700a8be91..4d7d2de27 100644 --- a/tests/data/devices/ikea-of-sweden-remote-control-n2.json +++ b/tests/data/devices/ikea-of-sweden-remote-control-n2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6b:e7:d0:70", "nwk": "0x5815", "manufacturer": "IKEA of Sweden", @@ -202,22 +202,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:6b:e7:d0:70:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:e7:d0:70", "endpoint_id": 1, "available": true, @@ -250,22 +234,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6b:e7:d0:70:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:e7:d0:70", "endpoint_id": 1, "available": true, @@ -294,22 +262,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6b:e7:d0:70:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:e7:d0:70", "endpoint_id": 1, "available": true, @@ -338,22 +290,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:6b:e7:d0:70:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:6b:e7:d0:70", "endpoint_id": 1, "available": true, @@ -391,22 +327,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6b:e7:d0:70:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:e7:d0:70", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-rodret-dimmer.json b/tests/data/devices/ikea-of-sweden-rodret-dimmer.json index 550aa0bb7..ec65ee5cb 100644 --- a/tests/data/devices/ikea-of-sweden-rodret-dimmer.json +++ b/tests/data/devices/ikea-of-sweden-rodret-dimmer.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "5c:c7:c1:ff:fe:cc:19:d9", "nwk": "0x92DB", "manufacturer": "IKEA of Sweden", @@ -222,22 +222,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "5c:c7:c1:ff:fe:cc:19:d9:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:c7:c1:ff:fe:cc:19:d9", "endpoint_id": 1, "available": true, @@ -270,22 +254,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "5c:c7:c1:ff:fe:cc:19:d9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:c7:c1:ff:fe:cc:19:d9", "endpoint_id": 1, "available": true, @@ -314,22 +282,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "5c:c7:c1:ff:fe:cc:19:d9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:c7:c1:ff:fe:cc:19:d9", "endpoint_id": 1, "available": true, @@ -358,22 +310,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "5c:c7:c1:ff:fe:cc:19:d9:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "5c:c7:c1:ff:fe:cc:19:d9", "endpoint_id": 1, "available": true, @@ -412,22 +348,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "5c:c7:c1:ff:fe:cc:19:d9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:c7:c1:ff:fe:cc:19:d9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-rodret-wireless-dimmer.json b/tests/data/devices/ikea-of-sweden-rodret-wireless-dimmer.json index 9a9d71900..1cce57e6b 100644 --- a/tests/data/devices/ikea-of-sweden-rodret-wireless-dimmer.json +++ b/tests/data/devices/ikea-of-sweden-rodret-wireless-dimmer.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:07:f8:aa:b7", "nwk": "0xB599", "manufacturer": "IKEA of Sweden", @@ -235,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:07:f8:aa:b7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:f8:aa:b7", "endpoint_id": 1, "available": true, @@ -283,22 +267,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:07:f8:aa:b7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:f8:aa:b7", "endpoint_id": 1, "available": true, @@ -327,22 +295,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:07:f8:aa:b7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:f8:aa:b7", "endpoint_id": 1, "available": true, @@ -371,22 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:07:f8:aa:b7:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:07:f8:aa:b7", "endpoint_id": 1, "available": true, @@ -425,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:07:f8:aa:b7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:f8:aa:b7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-somrig-shortcut-button.json b/tests/data/devices/ikea-of-sweden-somrig-shortcut-button.json index 2b7d59b07..0fc29e69e 100644 --- a/tests/data/devices/ikea-of-sweden-somrig-shortcut-button.json +++ b/tests/data/devices/ikea-of-sweden-somrig-shortcut-button.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6d:e6:02:47", "nwk": "0xDF5B", "manufacturer": "IKEA of Sweden", @@ -290,22 +290,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:6d:e6:02:47:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6d:e6:02:47", "endpoint_id": 1, "available": true, @@ -338,22 +322,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6d:e6:02:47:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6d:e6:02:47", "endpoint_id": 1, "available": true, @@ -382,22 +350,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6d:e6:02:47:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6d:e6:02:47", "endpoint_id": 1, "available": true, @@ -426,22 +378,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:6d:e6:02:47:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:6d:e6:02:47", "endpoint_id": 1, "available": true, @@ -480,22 +416,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6d:e6:02:47:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6d:e6:02:47", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-starkvind-air-purifier-table.json b/tests/data/devices/ikea-of-sweden-starkvind-air-purifier-table.json index 1ec2cf34f..2f2e1ca1c 100644 --- a/tests/data/devices/ikea-of-sweden-starkvind-air-purifier-table.json +++ b/tests/data/devices/ikea-of-sweden-starkvind-air-purifier-table.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e0:99:45:a5", "nwk": "0x80D4", "manufacturer": "IKEA of Sweden", @@ -324,22 +324,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, @@ -369,22 +353,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, @@ -417,22 +385,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, @@ -476,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, @@ -525,22 +461,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, @@ -569,22 +489,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, @@ -613,22 +517,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PM25ClusterHandler", - "generic_id": "cluster_handler_0x042a", - "endpoint_id": 1, - "cluster": { - "id": 1066, - "name": "PM2.5", - "type": "server" - }, - "id": "1:0x042a", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0x042a", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, @@ -657,22 +545,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, @@ -701,22 +573,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, @@ -747,22 +603,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, @@ -795,22 +635,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, @@ -845,22 +669,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e0:99:45:a5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:99:45:a5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-starkvind-air-purifier.json b/tests/data/devices/ikea-of-sweden-starkvind-air-purifier.json index 070f1aaa6..7964e3bd7 100644 --- a/tests/data/devices/ikea-of-sweden-starkvind-air-purifier.json +++ b/tests/data/devices/ikea-of-sweden-starkvind-air-purifier.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "0c:43:14:ff:fe:73:07:e2", "nwk": "0x8877", "manufacturer": "IKEA of Sweden", @@ -252,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, @@ -297,22 +281,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, @@ -345,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, @@ -404,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, @@ -453,22 +389,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, @@ -497,22 +417,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, @@ -541,22 +445,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PM25ClusterHandler", - "generic_id": "cluster_handler_0x042a", - "endpoint_id": 1, - "cluster": { - "id": 1066, - "name": "PM2.5", - "type": "server" - }, - "id": "1:0x042a", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0x042a", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, @@ -585,22 +473,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, @@ -629,22 +501,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, @@ -675,22 +531,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, @@ -723,22 +563,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IkeaAirPurifierClusterHandler", - "generic_id": "cluster_handler_0xfc7d", - "endpoint_id": 1, - "cluster": { - "id": 64637, - "name": "Ikea Airpurifier", - "type": "server" - }, - "id": "1:0xfc7d", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0xfc7d", - "status": "INITIALIZED", - "value_attribute": "filter_run_time" - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, @@ -773,22 +597,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "0c:43:14:ff:fe:73:07:e2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "0c:43:14:ff:fe:73:07:e2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-symfonisk-sound-remote-gen2.json b/tests/data/devices/ikea-of-sweden-symfonisk-sound-remote-gen2.json index 05ee8016c..3e1cab9c3 100644 --- a/tests/data/devices/ikea-of-sweden-symfonisk-sound-remote-gen2.json +++ b/tests/data/devices/ikea-of-sweden-symfonisk-sound-remote-gen2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:52:61:2b:43", "nwk": "0x17D7", "manufacturer": "IKEA of Sweden", @@ -215,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:52:61:2b:43:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:61:2b:43", "endpoint_id": 1, "available": true, @@ -263,22 +247,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:52:61:2b:43:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:61:2b:43", "endpoint_id": 1, "available": true, @@ -307,22 +275,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:52:61:2b:43:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:61:2b:43", "endpoint_id": 1, "available": true, @@ -351,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:52:61:2b:43:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:52:61:2b:43", "endpoint_id": 1, "available": true, @@ -405,22 +341,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:52:61:2b:43:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:61:2b:43", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e12-w-op-ch-400lm.json b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e12-w-op-ch-400lm.json index 3e29d900c..740a8d7f9 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e12-w-op-ch-400lm.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e12-w-op-ch-400lm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0b:57:ff:fe:d5:37:65", "nwk": "0x26E4", "manufacturer": "IKEA of Sweden", @@ -271,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0b:57:ff:fe:d5:37:65:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:d5:37:65", "endpoint_id": 1, "available": true, @@ -319,36 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0b:57:ff:fe:d5:37:65:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:d5:37:65:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:d5:37:65", "endpoint_id": 1, "available": true, @@ -402,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:d5:37:65:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:d5:37:65", "endpoint_id": 1, "available": true, @@ -449,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:d5:37:65:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:d5:37:65", "endpoint_id": 1, "available": true, @@ -496,22 +418,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:d5:37:65:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:d5:37:65", "endpoint_id": 1, "available": true, @@ -545,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0b:57:ff:fe:d5:37:65:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:0b:57:ff:fe:d5:37:65", "endpoint_id": 1, "available": true, @@ -596,22 +486,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:d5:37:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:d5:37:65", "endpoint_id": 1, "available": true, @@ -640,22 +514,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:d5:37:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:d5:37:65", "endpoint_id": 1, "available": true, @@ -686,22 +544,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0b:57:ff:fe:d5:37:65:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:d5:37:65", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e12-ws-opal-400lm.json b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e12-ws-opal-400lm.json index 9936d1ed8..b3e8f892d 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e12-ws-opal-400lm.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e12-ws-opal-400lm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "90:fd:9f:ff:fe:74:75:2c", "nwk": "0xFBA9", "manufacturer": "IKEA of Sweden", @@ -375,22 +375,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:fd:9f:ff:fe:74:75:2c", "endpoint_id": 1, "available": true, @@ -423,50 +407,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "90:fd:9f:ff:fe:74:75:2c", "endpoint_id": 1, "available": true, @@ -521,22 +461,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "90:fd:9f:ff:fe:74:75:2c", "endpoint_id": 1, "available": true, @@ -568,22 +492,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "90:fd:9f:ff:fe:74:75:2c", "endpoint_id": 1, "available": true, @@ -615,22 +523,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "90:fd:9f:ff:fe:74:75:2c", "endpoint_id": 1, "available": true, @@ -662,22 +554,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "90:fd:9f:ff:fe:74:75:2c", "endpoint_id": 1, "available": true, @@ -711,22 +587,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "90:fd:9f:ff:fe:74:75:2c", "endpoint_id": 1, "available": true, @@ -762,22 +622,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:fd:9f:ff:fe:74:75:2c", "endpoint_id": 1, "available": true, @@ -806,22 +650,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:fd:9f:ff:fe:74:75:2c", "endpoint_id": 1, "available": true, @@ -852,22 +680,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "90:fd:9f:ff:fe:74:75:2c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:fd:9f:ff:fe:74:75:2c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e14-ws-globe-470lm.json b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e14-ws-globe-470lm.json index 7c8fd6f3a..0b92b343c 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e14-ws-globe-470lm.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e14-ws-globe-470lm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:af:8d:14:56", "nwk": "0x7A25", "manufacturer": "IKEA of Sweden", @@ -320,22 +320,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:af:8d:14:56", "endpoint_id": 1, "available": true, @@ -368,50 +352,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:af:8d:14:56", "endpoint_id": 1, "available": true, @@ -466,22 +406,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:af:8d:14:56", "endpoint_id": 1, "available": true, @@ -513,22 +437,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:af:8d:14:56", "endpoint_id": 1, "available": true, @@ -560,22 +468,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:af:8d:14:56", "endpoint_id": 1, "available": true, @@ -607,22 +499,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:af:8d:14:56", "endpoint_id": 1, "available": true, @@ -656,22 +532,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:af:8d:14:56", "endpoint_id": 1, "available": true, @@ -707,22 +567,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:af:8d:14:56", "endpoint_id": 1, "available": true, @@ -751,22 +595,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:af:8d:14:56", "endpoint_id": 1, "available": true, @@ -797,22 +625,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:af:8d:14:56:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:af:8d:14:56", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-opal-1000lm.json b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-opal-1000lm.json index 676945984..087c96707 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-opal-1000lm.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-opal-1000lm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0b:57:ff:fe:39:3d:3c", "nwk": "0x15B7", "manufacturer": "IKEA of Sweden", @@ -271,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0b:57:ff:fe:39:3d:3c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:39:3d:3c", "endpoint_id": 1, "available": true, @@ -319,36 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0b:57:ff:fe:39:3d:3c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:39:3d:3c:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:39:3d:3c", "endpoint_id": 1, "available": true, @@ -402,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:39:3d:3c:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:39:3d:3c", "endpoint_id": 1, "available": true, @@ -449,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:39:3d:3c:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:39:3d:3c", "endpoint_id": 1, "available": true, @@ -496,22 +418,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:39:3d:3c:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:39:3d:3c", "endpoint_id": 1, "available": true, @@ -545,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0b:57:ff:fe:39:3d:3c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:0b:57:ff:fe:39:3d:3c", "endpoint_id": 1, "available": true, @@ -596,22 +486,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:39:3d:3c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:39:3d:3c", "endpoint_id": 1, "available": true, @@ -640,22 +514,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:39:3d:3c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:39:3d:3c", "endpoint_id": 1, "available": true, @@ -686,22 +544,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0b:57:ff:fe:39:3d:3c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:39:3d:3c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-w-opal-1000lm.json b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-w-opal-1000lm.json index 2586f2cdb..b29a934e2 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-w-opal-1000lm.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-w-opal-1000lm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0b:57:ff:fe:8e:8c:44", "nwk": "0xA68D", "manufacturer": "IKEA of Sweden", @@ -265,22 +265,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0b:57:ff:fe:8e:8c:44:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:8e:8c:44", "endpoint_id": 1, "available": true, @@ -313,36 +297,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0b:57:ff:fe:8e:8c:44:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:8e:8c:44:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:8e:8c:44", "endpoint_id": 1, "available": true, @@ -396,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:8e:8c:44:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:8e:8c:44", "endpoint_id": 1, "available": true, @@ -443,22 +381,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:8e:8c:44:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:8e:8c:44", "endpoint_id": 1, "available": true, @@ -490,22 +412,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:8e:8c:44:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:8e:8c:44", "endpoint_id": 1, "available": true, @@ -539,22 +445,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0b:57:ff:fe:8e:8c:44:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:0b:57:ff:fe:8e:8c:44", "endpoint_id": 1, "available": true, @@ -590,22 +480,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:8e:8c:44:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:8e:8c:44", "endpoint_id": 1, "available": true, @@ -634,22 +508,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:8e:8c:44:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:8e:8c:44", "endpoint_id": 1, "available": true, @@ -680,22 +538,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0b:57:ff:fe:8e:8c:44:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:8e:8c:44", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-ws-opal-980lm.json b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-ws-opal-980lm.json index 9d56d10c7..c1a479f91 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-ws-opal-980lm.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e26-ws-opal-980lm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0b:57:ff:fe:dd:49:54", "nwk": "0x380A", "manufacturer": "IKEA of Sweden", @@ -355,22 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:dd:49:54", "endpoint_id": 1, "available": true, @@ -403,50 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:0b:57:ff:fe:dd:49:54", "endpoint_id": 1, "available": true, @@ -501,22 +441,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:0b:57:ff:fe:dd:49:54", "endpoint_id": 1, "available": true, @@ -548,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:dd:49:54", "endpoint_id": 1, "available": true, @@ -595,22 +503,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:dd:49:54", "endpoint_id": 1, "available": true, @@ -642,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:dd:49:54", "endpoint_id": 1, "available": true, @@ -691,22 +567,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:0b:57:ff:fe:dd:49:54", "endpoint_id": 1, "available": true, @@ -742,22 +602,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:dd:49:54", "endpoint_id": 1, "available": true, @@ -786,22 +630,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:dd:49:54", "endpoint_id": 1, "available": true, @@ -832,22 +660,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0b:57:ff:fe:dd:49:54:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:dd:49:54", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e27-ws-globe-1055lm.json b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e27-ws-globe-1055lm.json index af12fa7ee..eaae510f3 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e27-ws-globe-1055lm.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e27-ws-globe-1055lm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:54:27:c9:2f", "nwk": "0xD172", "manufacturer": "IKEA of Sweden", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:54:27:c9:2f", "endpoint_id": 1, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:54:27:c9:2f", "endpoint_id": 1, "available": true, @@ -482,22 +422,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:54:27:c9:2f", "endpoint_id": 1, "available": true, @@ -529,22 +453,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:54:27:c9:2f", "endpoint_id": 1, "available": true, @@ -576,22 +484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:54:27:c9:2f", "endpoint_id": 1, "available": true, @@ -623,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:54:27:c9:2f", "endpoint_id": 1, "available": true, @@ -672,22 +548,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:54:27:c9:2f", "endpoint_id": 1, "available": true, @@ -723,22 +583,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:54:27:c9:2f", "endpoint_id": 1, "available": true, @@ -767,22 +611,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:54:27:c9:2f", "endpoint_id": 1, "available": true, @@ -813,22 +641,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:54:27:c9:2f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:54:27:c9:2f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e27-ww-g95-cl-470lm.json b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e27-ww-g95-cl-470lm.json index 59621b68f..e876bd3c2 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-bulb-e27-ww-g95-cl-470lm.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-bulb-e27-ww-g95-cl-470lm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:0e:4d:bd:b3", "nwk": "0x0D39", "manufacturer": "IKEA of Sweden", @@ -251,22 +251,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:0e:4d:bd:b3:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:4d:bd:b3", "endpoint_id": 1, "available": true, @@ -299,36 +283,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:0e:4d:bd:b3:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:0e:4d:bd:b3:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:0e:4d:bd:b3", "endpoint_id": 1, "available": true, @@ -382,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:0e:4d:bd:b3:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:0e:4d:bd:b3", "endpoint_id": 1, "available": true, @@ -429,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:0e:4d:bd:b3:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:0e:4d:bd:b3", "endpoint_id": 1, "available": true, @@ -476,22 +398,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:0e:4d:bd:b3:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:0e:4d:bd:b3", "endpoint_id": 1, "available": true, @@ -525,22 +431,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:0e:4d:bd:b3:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0e:4d:bd:b3", "endpoint_id": 1, "available": true, @@ -576,22 +466,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0e:4d:bd:b3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:4d:bd:b3", "endpoint_id": 1, "available": true, @@ -620,22 +494,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0e:4d:bd:b3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:4d:bd:b3", "endpoint_id": 1, "available": true, @@ -666,22 +524,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:0e:4d:bd:b3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:4d:bd:b3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ws-400lm.json b/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ws-400lm.json index 282046039..e5b340b69 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ws-400lm.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ws-400lm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "68:0a:e2:ff:fe:8f:fa:33", "nwk": "0x4F9C", "manufacturer": "IKEA of Sweden", @@ -381,22 +381,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:8f:fa:33", "endpoint_id": 1, "available": true, @@ -429,50 +413,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "68:0a:e2:ff:fe:8f:fa:33", "endpoint_id": 1, "available": true, @@ -527,22 +467,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "68:0a:e2:ff:fe:8f:fa:33", "endpoint_id": 1, "available": true, @@ -574,22 +498,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "68:0a:e2:ff:fe:8f:fa:33", "endpoint_id": 1, "available": true, @@ -621,22 +529,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "68:0a:e2:ff:fe:8f:fa:33", "endpoint_id": 1, "available": true, @@ -668,22 +560,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "68:0a:e2:ff:fe:8f:fa:33", "endpoint_id": 1, "available": true, @@ -717,22 +593,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "68:0a:e2:ff:fe:8f:fa:33", "endpoint_id": 1, "available": true, @@ -768,22 +628,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:8f:fa:33", "endpoint_id": 1, "available": true, @@ -812,22 +656,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:8f:fa:33", "endpoint_id": 1, "available": true, @@ -858,22 +686,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "68:0a:e2:ff:fe:8f:fa:33:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:8f:fa:33", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ww-345lm8.json b/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ww-345lm8.json index 1d15b9c5e..aaaafdefe 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ww-345lm8.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ww-345lm8.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ec:ce:b7:e4", "nwk": "0x0174", "manufacturer": "IKEA of Sweden", @@ -246,22 +246,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ec:ce:b7:e4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:ce:b7:e4", "endpoint_id": 1, "available": true, @@ -294,36 +278,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ec:ce:b7:e4:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ec:ce:b7:e4:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ec:ce:b7:e4", "endpoint_id": 1, "available": true, @@ -377,22 +331,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ec:ce:b7:e4:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ec:ce:b7:e4", "endpoint_id": 1, "available": true, @@ -424,22 +362,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ec:ce:b7:e4:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ec:ce:b7:e4", "endpoint_id": 1, "available": true, @@ -471,22 +393,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ec:ce:b7:e4:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ec:ce:b7:e4", "endpoint_id": 1, "available": true, @@ -520,22 +426,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ec:ce:b7:e4:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ec:ce:b7:e4", "endpoint_id": 1, "available": true, @@ -571,22 +461,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ec:ce:b7:e4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:ce:b7:e4", "endpoint_id": 1, "available": true, @@ -615,22 +489,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ec:ce:b7:e4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:ce:b7:e4", "endpoint_id": 1, "available": true, @@ -661,22 +519,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ec:ce:b7:e4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:ce:b7:e4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ww-400lm.json b/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ww-400lm.json index 991342a7e..3f789b4f2 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ww-400lm.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ww-400lm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d9:ce:e9:6e", "nwk": "0x560C", "manufacturer": "IKEA of Sweden", @@ -270,22 +270,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d9:ce:e9:6e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:ce:e9:6e", "endpoint_id": 1, "available": true, @@ -318,36 +302,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d9:ce:e9:6e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:d9:ce:e9:6e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:d9:ce:e9:6e", "endpoint_id": 1, "available": true, @@ -401,22 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:d9:ce:e9:6e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:d9:ce:e9:6e", "endpoint_id": 1, "available": true, @@ -448,22 +386,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:d9:ce:e9:6e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:d9:ce:e9:6e", "endpoint_id": 1, "available": true, @@ -495,22 +417,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:d9:ce:e9:6e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:d9:ce:e9:6e", "endpoint_id": 1, "available": true, @@ -544,22 +450,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d9:ce:e9:6e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:d9:ce:e9:6e", "endpoint_id": 1, "available": true, @@ -595,22 +485,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d9:ce:e9:6e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:ce:e9:6e", "endpoint_id": 1, "available": true, @@ -639,22 +513,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d9:ce:e9:6e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:ce:e9:6e", "endpoint_id": 1, "available": true, @@ -685,22 +543,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d9:ce:e9:6e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:ce:e9:6e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-control-outlet.json b/tests/data/devices/ikea-of-sweden-tradfri-control-outlet.json index 07682001d..116b9266c 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-control-outlet.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-control-outlet.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0d:6f:ff:fe:a5:b7:93", "nwk": "0xB55A", "manufacturer": "IKEA of Sweden", @@ -247,22 +247,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0d:6f:ff:fe:a5:b7:93:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:ff:fe:a5:b7:93", "endpoint_id": 1, "available": true, @@ -295,22 +279,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0d:6f:ff:fe:a5:b7:93:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:0d:6f:ff:fe:a5:b7:93", "endpoint_id": 1, "available": true, @@ -346,22 +314,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:ff:fe:a5:b7:93:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:ff:fe:a5:b7:93", "endpoint_id": 1, "available": true, @@ -390,22 +342,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:ff:fe:a5:b7:93:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:ff:fe:a5:b7:93", "endpoint_id": 1, "available": true, @@ -436,22 +372,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0d:6f:ff:fe:a5:b7:93:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:0d:6f:ff:fe:a5:b7:93", "endpoint_id": 1, "available": true, @@ -480,22 +400,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0d:6f:ff:fe:a5:b7:93:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:ff:fe:a5:b7:93", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-motion-sensor.json b/tests/data/devices/ikea-of-sweden-tradfri-motion-sensor.json index 7a002c11c..4a47830ad 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-motion-sensor.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-motion-sensor.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:99:94:76:3f", "nwk": "0xB9E6", "manufacturer": "IKEA of Sweden", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:99:94:76:3f:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:94:76:3f", "endpoint_id": 1, "available": true, @@ -266,22 +250,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:99:94:76:3f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:94:76:3f", "endpoint_id": 1, "available": true, @@ -314,22 +282,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:99:94:76:3f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:94:76:3f", "endpoint_id": 1, "available": true, @@ -358,22 +310,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:99:94:76:3f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:94:76:3f", "endpoint_id": 1, "available": true, @@ -402,22 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:99:94:76:3f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:99:94:76:3f", "endpoint_id": 1, "available": true, @@ -456,22 +376,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:99:94:76:3f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:94:76:3f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-on-off-switch.json b/tests/data/devices/ikea-of-sweden-tradfri-on-off-switch.json index 37ae1f0c3..11d3bbacb 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-on-off-switch.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-on-off-switch.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "14:b4:57:ff:fe:53:65:d7", "nwk": "0xDF86", "manufacturer": "IKEA of Sweden", @@ -220,22 +220,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "14:b4:57:ff:fe:53:65:d7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:53:65:d7", "endpoint_id": 1, "available": true, @@ -268,22 +252,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:b4:57:ff:fe:53:65:d7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:53:65:d7", "endpoint_id": 1, "available": true, @@ -312,22 +280,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:b4:57:ff:fe:53:65:d7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:53:65:d7", "endpoint_id": 1, "available": true, @@ -356,22 +308,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "14:b4:57:ff:fe:53:65:d7:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "14:b4:57:ff:fe:53:65:d7", "endpoint_id": 1, "available": true, @@ -410,22 +346,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "14:b4:57:ff:fe:53:65:d7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:53:65:d7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-open-close-remote.json b/tests/data/devices/ikea-of-sweden-tradfri-open-close-remote.json index 6a4e97f7d..d87b2b45c 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-open-close-remote.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-open-close-remote.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "38:5b:44:ff:fe:e6:8a:85", "nwk": "0x20A9", "manufacturer": "IKEA of Sweden", @@ -235,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "38:5b:44:ff:fe:e6:8a:85:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "38:5b:44:ff:fe:e6:8a:85", "endpoint_id": 1, "available": true, @@ -283,22 +267,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "38:5b:44:ff:fe:e6:8a:85:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "38:5b:44:ff:fe:e6:8a:85", "endpoint_id": 1, "available": true, @@ -327,22 +295,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "38:5b:44:ff:fe:e6:8a:85:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "38:5b:44:ff:fe:e6:8a:85", "endpoint_id": 1, "available": true, @@ -371,22 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "38:5b:44:ff:fe:e6:8a:85:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "38:5b:44:ff:fe:e6:8a:85", "endpoint_id": 1, "available": true, @@ -425,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "38:5b:44:ff:fe:e6:8a:85:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "38:5b:44:ff:fe:e6:8a:85", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-remote-control.json b/tests/data/devices/ikea-of-sweden-tradfri-remote-control.json index 4de50b60a..6018af8e2 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-remote-control.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-remote-control.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "90:fd:9f:ff:fe:fe:d8:a1", "nwk": "0x8183", "manufacturer": "IKEA of Sweden", @@ -220,22 +220,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "90:fd:9f:ff:fe:fe:d8:a1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:fd:9f:ff:fe:fe:d8:a1", "endpoint_id": 1, "available": true, @@ -268,22 +252,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "90:fd:9f:ff:fe:fe:d8:a1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:fd:9f:ff:fe:fe:d8:a1", "endpoint_id": 1, "available": true, @@ -312,22 +280,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "90:fd:9f:ff:fe:fe:d8:a1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:fd:9f:ff:fe:fe:d8:a1", "endpoint_id": 1, "available": true, @@ -356,22 +308,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "90:fd:9f:ff:fe:fe:d8:a1:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "90:fd:9f:ff:fe:fe:d8:a1", "endpoint_id": 1, "available": true, @@ -410,22 +346,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "90:fd:9f:ff:fe:fe:d8:a1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "90:fd:9f:ff:fe:fe:d8:a1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-shortcut-button.json b/tests/data/devices/ikea-of-sweden-tradfri-shortcut-button.json index 81abc8fe2..707b5eadb 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-shortcut-button.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-shortcut-button.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7d:a7:c6:3b", "nwk": "0x8047", "manufacturer": "IKEA of Sweden", @@ -215,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:7d:a7:c6:3b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:a7:c6:3b", "endpoint_id": 1, "available": true, @@ -263,22 +247,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7d:a7:c6:3b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:a7:c6:3b", "endpoint_id": 1, "available": true, @@ -307,22 +275,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7d:a7:c6:3b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:a7:c6:3b", "endpoint_id": 1, "available": true, @@ -351,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:7d:a7:c6:3b:1:0x0001", - "status": "CONFIGURED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:7d:a7:c6:3b", "endpoint_id": 1, "available": true, @@ -405,22 +341,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:7d:a7:c6:3b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:a7:c6:3b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-tradfri-wireless-dimmer.json b/tests/data/devices/ikea-of-sweden-tradfri-wireless-dimmer.json index 7e0b58c31..d6a905ba7 100644 --- a/tests/data/devices/ikea-of-sweden-tradfri-wireless-dimmer.json +++ b/tests/data/devices/ikea-of-sweden-tradfri-wireless-dimmer.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0b:57:ff:fe:2b:cf:1f", "nwk": "0xF049", "manufacturer": "IKEA of Sweden", @@ -227,22 +227,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0b:57:ff:fe:2b:cf:1f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:2b:cf:1f", "endpoint_id": 1, "available": true, @@ -275,22 +259,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:2b:cf:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:2b:cf:1f", "endpoint_id": 1, "available": true, @@ -319,22 +287,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:2b:cf:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:2b:cf:1f", "endpoint_id": 1, "available": true, @@ -363,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0b:57:ff:fe:2b:cf:1f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0b:57:ff:fe:2b:cf:1f", "endpoint_id": 1, "available": true, @@ -417,22 +353,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0b:57:ff:fe:2b:cf:1f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:2b:cf:1f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ikea-of-sweden-vallhorn-wireless-motion-sensor.json b/tests/data/devices/ikea-of-sweden-vallhorn-wireless-motion-sensor.json index b41ce13ca..906233fd7 100644 --- a/tests/data/devices/ikea-of-sweden-vallhorn-wireless-motion-sensor.json +++ b/tests/data/devices/ikea-of-sweden-vallhorn-wireless-motion-sensor.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "8c:6f:b9:ff:fe:26:3b:4a", "nwk": "0x9EB6", "manufacturer": "IKEA of Sweden", @@ -384,22 +384,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 1, "available": true, @@ -427,22 +411,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 2, "available": true, @@ -472,22 +440,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 1, "available": true, @@ -520,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc81", - "endpoint_id": 1, - "cluster": { - "id": 64641, - "name": "IKEA manufacturer specific config", - "type": "server" - }, - "id": "1:0xfc81", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:1:0xfc81", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 1, "available": true, @@ -567,22 +503,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 2, "available": true, @@ -614,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 2, "available": true, @@ -663,22 +567,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 1, "available": true, @@ -707,22 +595,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 1, "available": true, @@ -751,22 +623,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 1, "available": true, @@ -803,22 +659,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 3, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "3:0x0400", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:3:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 3, "available": true, @@ -849,22 +689,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc81", - "endpoint_id": 1, - "cluster": { - "id": 64641, - "name": "IKEA manufacturer specific config", - "type": "server" - }, - "id": "1:0xfc81", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:1:0xfc81", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 1, "available": true, @@ -899,22 +723,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "8c:6f:b9:ff:fe:26:3b:4a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "8c:6f:b9:ff:fe:26:3b:4a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/imagic-by-greatstar-1112-s.json b/tests/data/devices/imagic-by-greatstar-1112-s.json index b7f3e9d9f..518afe582 100644 --- a/tests/data/devices/imagic-by-greatstar-1112-s.json +++ b/tests/data/devices/imagic-by-greatstar-1112-s.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:06:61:9f:d3", "nwk": "0x444E", "manufacturer": "iMagic by GreatStar", @@ -269,22 +269,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasAceClientClusterHandler", - "generic_id": "cluster_handler_0x0501_client", - "endpoint_id": 1, - "cluster": { - "id": 1281, - "name": "IAS Ancillary Control Equipment", - "type": "client" - }, - "id": "1:0x0501_client", - "unique_id": "ab:cd:ef:12:06:61:9f:d3:1:0x0501_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:61:9f:d3", "endpoint_id": 1, "available": true, @@ -316,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:06:61:9f:d3:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:61:9f:d3", "endpoint_id": 1, "available": true, @@ -361,22 +329,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:06:61:9f:d3:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:61:9f:d3", "endpoint_id": 1, "available": true, @@ -409,22 +361,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:06:61:9f:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:61:9f:d3", "endpoint_id": 1, "available": true, @@ -453,22 +389,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:06:61:9f:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:61:9f:d3", "endpoint_id": 1, "available": true, @@ -497,22 +417,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:06:61:9f:d3:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:06:61:9f:d3", "endpoint_id": 1, "available": true, @@ -549,22 +453,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:06:61:9f:d3:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:06:61:9f:d3", "endpoint_id": 1, "available": true, @@ -593,22 +481,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:06:61:9f:d3:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:06:61:9f:d3", "endpoint_id": 1, "available": true, @@ -639,22 +511,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:06:61:9f:d3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:61:9f:d3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/innr-ae-280-c.json b/tests/data/devices/innr-ae-280-c.json index b7cb8432a..86e45b685 100644 --- a/tests/data/devices/innr-ae-280-c.json +++ b/tests/data/devices/innr-ae-280-c.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "14:2d:41:ff:fe:58:aa:27", "nwk": "0x20C0", "manufacturer": "innr", @@ -301,22 +301,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:2d:41:ff:fe:58:aa:27", "endpoint_id": 1, "available": true, @@ -349,50 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "14:2d:41:ff:fe:58:aa:27", "endpoint_id": 1, "available": true, @@ -453,22 +393,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "14:2d:41:ff:fe:58:aa:27", "endpoint_id": 1, "available": true, @@ -500,22 +424,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "14:2d:41:ff:fe:58:aa:27", "endpoint_id": 1, "available": true, @@ -547,22 +455,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "14:2d:41:ff:fe:58:aa:27", "endpoint_id": 1, "available": true, @@ -594,22 +486,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "14:2d:41:ff:fe:58:aa:27", "endpoint_id": 1, "available": true, @@ -643,22 +519,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "14:2d:41:ff:fe:58:aa:27", "endpoint_id": 1, "available": true, @@ -694,22 +554,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:2d:41:ff:fe:58:aa:27", "endpoint_id": 1, "available": true, @@ -738,22 +582,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:2d:41:ff:fe:58:aa:27", "endpoint_id": 1, "available": true, @@ -784,22 +612,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "14:2d:41:ff:fe:58:aa:27:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:2d:41:ff:fe:58:aa:27", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/innr-rb-285-c.json b/tests/data/devices/innr-rb-285-c.json index 48690e47e..b1ed32b5a 100644 --- a/tests/data/devices/innr-rb-285-c.json +++ b/tests/data/devices/innr-rb-285-c.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:03:00:01:62", "nwk": "0xCF52", "manufacturer": "innr", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:03:00:01:62:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:03:00:01:62", "endpoint_id": 1, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:15:8d:00:03:00:01:62:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:15:8d:00:03:00:01:62:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "00:15:8d:00:03:00:01:62:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:15:8d:00:03:00:01:62", "endpoint_id": 1, "available": true, @@ -488,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "00:15:8d:00:03:00:01:62:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:15:8d:00:03:00:01:62", "endpoint_id": 1, "available": true, @@ -535,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:15:8d:00:03:00:01:62:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:15:8d:00:03:00:01:62", "endpoint_id": 1, "available": true, @@ -584,22 +492,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:15:8d:00:03:00:01:62:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:15:8d:00:03:00:01:62", "endpoint_id": 1, "available": true, @@ -635,22 +527,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:03:00:01:62:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:03:00:01:62", "endpoint_id": 1, "available": true, @@ -679,22 +555,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:03:00:01:62:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:03:00:01:62", "endpoint_id": 1, "available": true, @@ -725,22 +585,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:15:8d:00:03:00:01:62:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:03:00:01:62", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/innr-rc-250.json b/tests/data/devices/innr-rc-250.json index b3d8bb14d..2e6001033 100644 --- a/tests/data/devices/innr-rc-250.json +++ b/tests/data/devices/innr-rc-250.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:25:3a:b6:6f", "nwk": "0xDD91", "manufacturer": "innr", @@ -215,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:25:3a:b6:6f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:3a:b6:6f", "endpoint_id": 1, "available": true, @@ -263,22 +247,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:25:3a:b6:6f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:3a:b6:6f", "endpoint_id": 1, "available": true, @@ -307,22 +275,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:25:3a:b6:6f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:3a:b6:6f", "endpoint_id": 1, "available": true, @@ -351,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:25:3a:b6:6f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:25:3a:b6:6f", "endpoint_id": 1, "available": true, @@ -405,22 +341,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:25:3a:b6:6f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:3a:b6:6f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/innr-rs-232-c.json b/tests/data/devices/innr-rs-232-c.json index 468c306b6..6834a9aa9 100644 --- a/tests/data/devices/innr-rs-232-c.json +++ b/tests/data/devices/innr-rs-232-c.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f1:3f:19:36", "nwk": "0xF875", "manufacturer": "innr", @@ -318,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, @@ -366,50 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, @@ -470,22 +410,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, @@ -517,22 +441,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, @@ -564,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, @@ -611,22 +503,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, @@ -658,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, @@ -705,22 +565,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, @@ -754,22 +598,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, @@ -805,22 +633,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, @@ -849,22 +661,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, @@ -895,22 +691,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f1:3f:19:36:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:3f:19:36", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/innr-sp-120.json b/tests/data/devices/innr-sp-120.json index 62fd2e310..889795773 100644 --- a/tests/data/devices/innr-sp-120.json +++ b/tests/data/devices/innr-sp-120.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:76:d3:fb:4b", "nwk": "0x66C3", "manufacturer": "innr", @@ -583,22 +583,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:76:d3:fb:4b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:76:d3:fb:4b", "endpoint_id": 1, "available": true, @@ -631,22 +615,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:76:d3:fb:4b:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:76:d3:fb:4b", "endpoint_id": 1, "available": true, @@ -680,22 +648,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:76:d3:fb:4b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:76:d3:fb:4b", "endpoint_id": 1, "available": true, @@ -724,22 +676,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:76:d3:fb:4b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:76:d3:fb:4b", "endpoint_id": 1, "available": true, @@ -768,22 +704,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "MeteringClusterInnrOld", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:76:d3:fb:4b:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:76:d3:fb:4b", "endpoint_id": 1, "available": true, @@ -811,7 +731,7 @@ "unique_id": "ab:cd:ef:12:76:d3:fb:4b-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -820,22 +740,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:76:d3:fb:4b:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:76:d3:fb:4b", "endpoint_id": 1, "available": true, @@ -844,7 +748,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "" @@ -869,22 +773,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:76:d3:fb:4b:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:76:d3:fb:4b", "endpoint_id": 1, "available": true, @@ -918,22 +806,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:76:d3:fb:4b:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:76:d3:fb:4b", "endpoint_id": 1, "available": true, @@ -969,22 +841,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:76:d3:fb:4b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:76:d3:fb:4b", "endpoint_id": 1, "available": true, @@ -1013,22 +869,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:76:d3:fb:4b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:76:d3:fb:4b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/innr-sp-234.json b/tests/data/devices/innr-sp-234.json index 57a8bad1c..f2d0da3e9 100755 --- a/tests/data/devices/innr-sp-234.json +++ b/tests/data/devices/innr-sp-234.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "70:ac:08:ff:fe:ef:c4:b7", "nwk": "0x3E2B", "manufacturer": "innr", @@ -456,22 +456,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "70:ac:08:ff:fe:ef:c4:b7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "70:ac:08:ff:fe:ef:c4:b7", "endpoint_id": 1, "available": true, @@ -504,22 +488,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "70:ac:08:ff:fe:ef:c4:b7:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "70:ac:08:ff:fe:ef:c4:b7", "endpoint_id": 1, "available": true, @@ -555,22 +523,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "70:ac:08:ff:fe:ef:c4:b7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "70:ac:08:ff:fe:ef:c4:b7", "endpoint_id": 1, "available": true, @@ -599,22 +551,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "70:ac:08:ff:fe:ef:c4:b7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "70:ac:08:ff:fe:ef:c4:b7", "endpoint_id": 1, "available": true, @@ -643,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "MeteringClusterInnrOld", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "70:ac:08:ff:fe:ef:c4:b7:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "70:ac:08:ff:fe:ef:c4:b7", "endpoint_id": 1, "available": true, @@ -686,7 +606,7 @@ "unique_id": "70:ac:08:ff:fe:ef:c4:b7-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "ReportingElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -695,22 +615,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "70:ac:08:ff:fe:ef:c4:b7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "70:ac:08:ff:fe:ef:c4:b7", "endpoint_id": 1, "available": true, @@ -719,7 +623,7 @@ "unit": "W" }, "state": { - "class_name": "ReportingElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -744,22 +648,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "70:ac:08:ff:fe:ef:c4:b7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "70:ac:08:ff:fe:ef:c4:b7", "endpoint_id": 1, "available": true, @@ -793,22 +681,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "70:ac:08:ff:fe:ef:c4:b7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "70:ac:08:ff:fe:ef:c4:b7", "endpoint_id": 1, "available": true, @@ -844,22 +716,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "70:ac:08:ff:fe:ef:c4:b7:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "70:ac:08:ff:fe:ef:c4:b7", "endpoint_id": 1, "available": true, @@ -888,22 +744,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "70:ac:08:ff:fe:ef:c4:b7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "70:ac:08:ff:fe:ef:c4:b7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/innr-sp-240.json b/tests/data/devices/innr-sp-240.json index 0628c61e3..499692086 100644 --- a/tests/data/devices/innr-sp-240.json +++ b/tests/data/devices/innr-sp-240.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:39:51:53:67", "nwk": "0x2020", "manufacturer": "innr", @@ -589,22 +589,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:39:51:53:67:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:51:53:67", "endpoint_id": 1, "available": true, @@ -637,22 +621,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:39:51:53:67:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:39:51:53:67", "endpoint_id": 1, "available": true, @@ -688,22 +656,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:51:53:67:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:51:53:67", "endpoint_id": 1, "available": true, @@ -732,22 +684,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:51:53:67:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:51:53:67", "endpoint_id": 1, "available": true, @@ -776,22 +712,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "MeteringClusterInnrNew", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:39:51:53:67:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:39:51:53:67", "endpoint_id": 1, "available": true, @@ -819,7 +739,7 @@ "unique_id": "ab:cd:ef:12:39:51:53:67-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -828,22 +748,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:39:51:53:67:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:39:51:53:67", "endpoint_id": 1, "available": true, @@ -852,7 +756,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 2.0, "measurement_type": "ACTIVE_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -877,22 +781,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:39:51:53:67:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:39:51:53:67", "endpoint_id": 1, "available": true, @@ -926,22 +814,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:39:51:53:67:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:39:51:53:67", "endpoint_id": 1, "available": true, @@ -977,22 +849,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:39:51:53:67:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:39:51:53:67", "endpoint_id": 1, "available": true, @@ -1021,22 +877,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:39:51:53:67:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:51:53:67", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/innr-sp-242.json b/tests/data/devices/innr-sp-242.json index 78304d2ff..15626e143 100644 --- a/tests/data/devices/innr-sp-242.json +++ b/tests/data/devices/innr-sp-242.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:86:df:1b:97", "nwk": "0x89D2", "manufacturer": "innr", @@ -577,22 +577,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -625,22 +609,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -672,22 +640,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -719,22 +671,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -766,22 +702,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -813,22 +733,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -862,22 +766,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -913,22 +801,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -957,22 +829,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -1001,22 +857,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -1044,7 +884,7 @@ "unique_id": "ab:cd:ef:12:86:df:1b:97-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1053,22 +893,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -1077,7 +901,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -1102,22 +926,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -1151,22 +959,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -1202,22 +994,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, @@ -1246,22 +1022,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:86:df:1b:97:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:86:df:1b:97", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/inovelli-vzm30-sn.json b/tests/data/devices/inovelli-vzm30-sn.json index 1b201a2ee..a6ab18b82 100644 --- a/tests/data/devices/inovelli-vzm30-sn.json +++ b/tests/data/devices/inovelli-vzm30-sn.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:9a:d6:cb:e7", "nwk": "0x3F4D", "manufacturer": "Inovelli", @@ -781,22 +781,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -829,36 +813,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -912,22 +866,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -959,22 +897,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1006,22 +928,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1053,22 +959,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1102,22 +992,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1153,22 +1027,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1197,22 +1055,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1241,22 +1083,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1284,7 +1110,7 @@ "unique_id": "ab:cd:ef:12:9a:d6:cb:e7-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1293,22 +1119,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1317,7 +1127,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -1341,22 +1151,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1389,22 +1183,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1437,22 +1215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM30SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1481,22 +1243,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM30SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, @@ -1525,22 +1271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 4, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "4:0x0402", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:4:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 4, "available": true, @@ -1569,22 +1299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 4, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "4:0x0405", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:4:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 4, "available": true, @@ -1615,22 +1329,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:9a:d6:cb:e7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9a:d6:cb:e7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/inovelli-vzm31-sn.json b/tests/data/devices/inovelli-vzm31-sn.json index b6a80576b..4478d9fb5 100644 --- a/tests/data/devices/inovelli-vzm31-sn.json +++ b/tests/data/devices/inovelli-vzm31-sn.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:dc:41:3c:40", "nwk": "0x46DF", "manufacturer": "Inovelli", @@ -909,22 +909,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -957,36 +941,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1040,22 +994,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1087,22 +1025,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1134,22 +1056,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1181,22 +1087,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1228,22 +1118,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1275,22 +1149,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1322,22 +1180,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1369,22 +1211,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1416,22 +1242,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1463,22 +1273,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1510,22 +1304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1557,22 +1335,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1604,22 +1366,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1651,22 +1397,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1698,22 +1428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1745,22 +1459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1792,22 +1490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1839,22 +1521,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1886,22 +1552,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1933,22 +1583,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -1980,22 +1614,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2027,22 +1645,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2074,22 +1676,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2123,22 +1709,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2172,22 +1742,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2219,22 +1773,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2266,22 +1804,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2317,22 +1839,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2361,22 +1867,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2405,22 +1895,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2448,7 +1922,7 @@ "unique_id": "ab:cd:ef:12:dc:41:3c:40-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "ReportingElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -2457,22 +1931,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2481,7 +1939,7 @@ "unit": "W" }, "state": { - "class_name": "ReportingElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -2505,22 +1963,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2549,22 +1991,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2595,22 +2021,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2643,22 +2053,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2691,22 +2085,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2739,22 +2117,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2787,22 +2149,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2835,22 +2181,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2883,22 +2213,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2931,22 +2245,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM31SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, @@ -2981,22 +2279,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:dc:41:3c:40:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:41:3c:40", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/inovelli-vzm35-sn.json b/tests/data/devices/inovelli-vzm35-sn.json index f0012ae96..b1335f3ab 100644 --- a/tests/data/devices/inovelli-vzm35-sn.json +++ b/tests/data/devices/inovelli-vzm35-sn.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:03:3d:90:21", "nwk": "0xE534", "manufacturer": "Inovelli", @@ -570,22 +570,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -618,36 +602,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -701,22 +655,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -748,22 +686,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -795,22 +717,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -842,22 +748,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -889,22 +779,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -936,22 +810,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -983,22 +841,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1030,22 +872,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1077,22 +903,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1124,22 +934,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1171,22 +965,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1218,22 +996,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1265,22 +1027,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1312,22 +1058,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1359,22 +1089,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1406,22 +1120,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1453,22 +1151,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1500,22 +1182,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1547,22 +1213,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1594,22 +1244,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1641,22 +1275,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1688,22 +1306,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1735,22 +1337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1782,22 +1368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1829,22 +1399,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1876,22 +1430,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1925,22 +1463,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -1974,22 +1496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2021,22 +1527,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2077,22 +1567,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2126,22 +1600,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2170,22 +1628,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2214,22 +1656,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2258,22 +1684,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2304,22 +1714,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2352,22 +1746,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2400,22 +1778,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2448,22 +1810,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2496,22 +1842,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2544,22 +1874,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2592,22 +1906,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2640,22 +1938,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2688,22 +1970,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "InovelliConfigEntityClusterHandler", - "generic_id": "cluster_handler_0xfc31", - "endpoint_id": 1, - "cluster": { - "id": 64561, - "name": "InovelliVZM35SNCluster", - "type": "server" - }, - "id": "1:0xfc31", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0xfc31", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, @@ -2738,22 +2004,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:03:3d:90:21:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:3d:90:21", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/isilentllc-dog-feeder.json b/tests/data/devices/isilentllc-dog-feeder.json index f4c9247db..788a4bd4d 100644 --- a/tests/data/devices/isilentllc-dog-feeder.json +++ b/tests/data/devices/isilentllc-dog-feeder.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:13:a2:00:41:67:1f:d7", "nwk": "0xB988", "manufacturer": "iSilentLLC", @@ -324,22 +324,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "00:13:a2:00:41:67:1f:d7:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:13:a2:00:41:67:1f:d7", "endpoint_id": 1, "available": true, @@ -367,22 +351,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 2, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "2:0x000f", - "unique_id": "00:13:a2:00:41:67:1f:d7:2:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:13:a2:00:41:67:1f:d7", "endpoint_id": 2, "available": true, @@ -410,22 +378,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 4, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "4:0x000f", - "unique_id": "00:13:a2:00:41:67:1f:d7:4:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:13:a2:00:41:67:1f:d7", "endpoint_id": 4, "available": true, @@ -455,22 +407,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 1, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "1:0x000d", - "unique_id": "00:13:a2:00:41:67:1f:d7:1:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:13:a2:00:41:67:1f:d7", "endpoint_id": 1, "available": true, @@ -504,22 +440,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:41:67:1f:d7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:41:67:1f:d7", "endpoint_id": 1, "available": true, @@ -548,22 +468,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:41:67:1f:d7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:41:67:1f:d7", "endpoint_id": 1, "available": true, @@ -594,22 +498,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:13:a2:00:41:67:1f:d7:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:13:a2:00:41:67:1f:d7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/isilentllc-doorbell.json b/tests/data/devices/isilentllc-doorbell.json index 20650a1f2..a059b602a 100644 --- a/tests/data/devices/isilentllc-doorbell.json +++ b/tests/data/devices/isilentllc-doorbell.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:13:a2:00:40:c0:4e:54", "nwk": "0x8F36", "manufacturer": "iSilentLLC", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "00:13:a2:00:40:c0:4e:54:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:13:a2:00:40:c0:4e:54", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:40:c0:4e:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:40:c0:4e:54", "endpoint_id": 1, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:40:c0:4e:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:40:c0:4e:54", "endpoint_id": 1, "available": true, @@ -316,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 2, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "2:0x0402", - "unique_id": "00:13:a2:00:40:c0:4e:54:2:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:13:a2:00:40:c0:4e:54", "endpoint_id": 2, "available": true, @@ -360,22 +296,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 2, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "2:0x0405", - "unique_id": "00:13:a2:00:40:c0:4e:54:2:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:13:a2:00:40:c0:4e:54", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/isilentllc-freezer-monitor.json b/tests/data/devices/isilentllc-freezer-monitor.json index 5019536f1..a3b620216 100644 --- a/tests/data/devices/isilentllc-freezer-monitor.json +++ b/tests/data/devices/isilentllc-freezer-monitor.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "f0:f5:bd:ff:fe:2c:e0:90", "nwk": "0xEE0B", "manufacturer": "iSilentLLC", @@ -195,22 +195,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "f0:f5:bd:ff:fe:2c:e0:90:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "f0:f5:bd:ff:fe:2c:e0:90", "endpoint_id": 1, "available": true, @@ -240,22 +224,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "f0:f5:bd:ff:fe:2c:e0:90:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:f5:bd:ff:fe:2c:e0:90", "endpoint_id": 1, "available": true, @@ -288,22 +256,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f0:f5:bd:ff:fe:2c:e0:90:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:f5:bd:ff:fe:2c:e0:90", "endpoint_id": 1, "available": true, @@ -332,22 +284,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f0:f5:bd:ff:fe:2c:e0:90:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:f5:bd:ff:fe:2c:e0:90", "endpoint_id": 1, "available": true, @@ -376,22 +312,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 3, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "3:0x0402", - "unique_id": "f0:f5:bd:ff:fe:2c:e0:90:3:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "f0:f5:bd:ff:fe:2c:e0:90", "endpoint_id": 3, "available": true, diff --git a/tests/data/devices/isilentllc-home-energy-monitor.json b/tests/data/devices/isilentllc-home-energy-monitor.json index f104ee5d7..4242cdf12 100644 --- a/tests/data/devices/isilentllc-home-energy-monitor.json +++ b/tests/data/devices/isilentllc-home-energy-monitor.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:13:a2:00:41:93:fe:df", "nwk": "0x29E5", "manufacturer": "iSilentLLC", @@ -4009,22 +4009,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:41:93:fe:df:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 1, "available": true, @@ -4053,22 +4037,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:41:93:fe:df:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 1, "available": true, @@ -4088,7 +4056,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-10-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -4097,22 +4065,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 10, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "10:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:10:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 10, "available": true, @@ -4121,7 +4073,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 16.11, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -4146,22 +4098,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 10, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "10:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:10:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 10, "available": true, @@ -4195,22 +4131,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 10, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "10:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:10:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 10, "available": true, @@ -4243,22 +4163,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 10, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "10:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:10:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 10, "available": true, @@ -4291,22 +4195,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 10, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "10:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:10:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 10, "available": true, @@ -4340,22 +4228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 10, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "10:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:10:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 10, "available": true, @@ -4380,7 +4252,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-11-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -4389,22 +4261,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 11, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "11:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:11:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 11, "available": true, @@ -4413,7 +4269,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 61.25, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -4438,22 +4294,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 11, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "11:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:11:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 11, "available": true, @@ -4487,22 +4327,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 11, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "11:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:11:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 11, "available": true, @@ -4535,22 +4359,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 11, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "11:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:11:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 11, "available": true, @@ -4583,22 +4391,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 11, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "11:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:11:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 11, "available": true, @@ -4632,22 +4424,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 11, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "11:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:11:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 11, "available": true, @@ -4672,7 +4448,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-12-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -4681,22 +4457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 12, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "12:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:12:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 12, "available": true, @@ -4705,7 +4465,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.37, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -4730,22 +4490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 12, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "12:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:12:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 12, "available": true, @@ -4779,22 +4523,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 12, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "12:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:12:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 12, "available": true, @@ -4827,22 +4555,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 12, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "12:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:12:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 12, "available": true, @@ -4875,22 +4587,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 12, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "12:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:12:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 12, "available": true, @@ -4924,22 +4620,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 12, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "12:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:12:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 12, "available": true, @@ -4964,7 +4644,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-13-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -4973,22 +4653,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 13, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "13:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:13:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 13, "available": true, @@ -4997,7 +4661,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 73.87, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -5022,22 +4686,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 13, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "13:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:13:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 13, "available": true, @@ -5071,22 +4719,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 13, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "13:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:13:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 13, "available": true, @@ -5119,22 +4751,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 13, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "13:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:13:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 13, "available": true, @@ -5167,22 +4783,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 13, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "13:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:13:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 13, "available": true, @@ -5216,22 +4816,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 13, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "13:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:13:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 13, "available": true, @@ -5256,7 +4840,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-14-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -5265,22 +4849,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 14, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "14:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:14:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 14, "available": true, @@ -5289,7 +4857,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 80.66, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -5314,22 +4882,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 14, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "14:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:14:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 14, "available": true, @@ -5363,22 +4915,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 14, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "14:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:14:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 14, "available": true, @@ -5411,22 +4947,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 14, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "14:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:14:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 14, "available": true, @@ -5459,22 +4979,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 14, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "14:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:14:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 14, "available": true, @@ -5508,22 +5012,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 14, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "14:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:14:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 14, "available": true, @@ -5548,7 +5036,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-15-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -5557,22 +5045,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 15, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "15:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:15:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 15, "available": true, @@ -5581,7 +5053,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 5.34, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -5606,22 +5078,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 15, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "15:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:15:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 15, "available": true, @@ -5655,22 +5111,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 15, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "15:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:15:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 15, "available": true, @@ -5703,22 +5143,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 15, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "15:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:15:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 15, "available": true, @@ -5751,22 +5175,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 15, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "15:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:15:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 15, "available": true, @@ -5800,22 +5208,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 15, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "15:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:15:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 15, "available": true, @@ -5840,7 +5232,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-16-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -5849,22 +5241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 16, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "16:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:16:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 16, "available": true, @@ -5873,7 +5249,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 82.07, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -5898,22 +5274,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 16, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "16:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:16:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 16, "available": true, @@ -5947,22 +5307,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 16, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "16:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:16:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 16, "available": true, @@ -5995,22 +5339,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 16, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "16:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:16:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 16, "available": true, @@ -6043,22 +5371,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 16, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "16:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:16:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 16, "available": true, @@ -6092,22 +5404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 16, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "16:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:16:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 16, "available": true, @@ -6132,7 +5428,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-17-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -6141,22 +5437,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 17, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "17:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:17:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 17, "available": true, @@ -6165,7 +5445,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 53.88, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -6190,22 +5470,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 17, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "17:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:17:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 17, "available": true, @@ -6239,22 +5503,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 17, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "17:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:17:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 17, "available": true, @@ -6287,22 +5535,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 17, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "17:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:17:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 17, "available": true, @@ -6335,22 +5567,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 17, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "17:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:17:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 17, "available": true, @@ -6384,22 +5600,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 17, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "17:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:17:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 17, "available": true, @@ -6424,7 +5624,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-18-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -6433,22 +5633,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 18, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "18:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:18:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 18, "available": true, @@ -6457,7 +5641,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 15.29, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -6482,22 +5666,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 18, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "18:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:18:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 18, "available": true, @@ -6531,22 +5699,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 18, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "18:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:18:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 18, "available": true, @@ -6579,22 +5731,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 18, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "18:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:18:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 18, "available": true, @@ -6627,22 +5763,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 18, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "18:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:18:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 18, "available": true, @@ -6676,22 +5796,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 18, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "18:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:18:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 18, "available": true, @@ -6716,7 +5820,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-19-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -6725,22 +5829,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 19, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "19:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:19:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 19, "available": true, @@ -6749,7 +5837,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 2.92, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -6774,22 +5862,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 19, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "19:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:19:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 19, "available": true, @@ -6823,22 +5895,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 19, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "19:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:19:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 19, "available": true, @@ -6871,22 +5927,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 19, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "19:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:19:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 19, "available": true, @@ -6919,22 +5959,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 19, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "19:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:19:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 19, "available": true, @@ -6968,22 +5992,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 19, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "19:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:19:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 19, "available": true, @@ -7008,7 +6016,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-2-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -7017,22 +6025,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 2, "available": true, @@ -7041,7 +6033,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 10.61, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -7066,22 +6058,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 2, "available": true, @@ -7115,22 +6091,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 2, "available": true, @@ -7163,22 +6123,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 2, "available": true, @@ -7211,22 +6155,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 2, "available": true, @@ -7260,22 +6188,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 2, "available": true, @@ -7300,7 +6212,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-20-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -7309,22 +6221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 20, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "20:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:20:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 20, "available": true, @@ -7333,7 +6229,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 59.51, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -7358,22 +6254,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 20, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "20:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:20:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 20, "available": true, @@ -7407,22 +6287,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 20, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "20:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:20:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 20, "available": true, @@ -7455,22 +6319,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 20, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "20:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:20:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 20, "available": true, @@ -7503,22 +6351,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 20, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "20:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:20:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 20, "available": true, @@ -7552,22 +6384,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 20, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "20:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:20:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 20, "available": true, @@ -7592,7 +6408,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-21-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -7601,22 +6417,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 21, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "21:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:21:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 21, "available": true, @@ -7625,7 +6425,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 4.17, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -7650,22 +6450,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 21, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "21:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:21:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 21, "available": true, @@ -7699,22 +6483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 21, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "21:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:21:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 21, "available": true, @@ -7747,22 +6515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 21, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "21:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:21:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 21, "available": true, @@ -7795,22 +6547,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 21, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "21:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:21:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 21, "available": true, @@ -7844,22 +6580,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 21, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "21:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:21:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 21, "available": true, @@ -7884,7 +6604,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-22-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -7893,22 +6613,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 22, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "22:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:22:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 22, "available": true, @@ -7917,7 +6621,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 61.28, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -7942,22 +6646,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 22, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "22:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:22:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 22, "available": true, @@ -7991,22 +6679,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 22, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "22:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:22:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 22, "available": true, @@ -8039,22 +6711,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 22, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "22:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:22:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 22, "available": true, @@ -8087,22 +6743,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 22, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "22:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:22:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 22, "available": true, @@ -8136,22 +6776,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 22, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "22:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:22:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 22, "available": true, @@ -8176,7 +6800,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-23-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -8185,22 +6809,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 23, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "23:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:23:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 23, "available": true, @@ -8209,7 +6817,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 11.9, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -8234,22 +6842,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 23, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "23:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:23:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 23, "available": true, @@ -8283,22 +6875,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 23, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "23:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:23:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 23, "available": true, @@ -8331,22 +6907,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 23, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "23:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:23:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 23, "available": true, @@ -8379,22 +6939,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 23, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "23:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:23:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 23, "available": true, @@ -8428,22 +6972,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 23, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "23:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:23:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 23, "available": true, @@ -8468,7 +6996,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-24-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -8477,22 +7005,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 24, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "24:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:24:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 24, "available": true, @@ -8501,7 +7013,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 4.11, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -8526,22 +7038,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 24, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "24:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:24:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 24, "available": true, @@ -8575,22 +7071,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 24, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "24:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:24:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 24, "available": true, @@ -8623,22 +7103,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 24, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "24:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:24:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 24, "available": true, @@ -8671,22 +7135,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 24, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "24:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:24:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 24, "available": true, @@ -8720,22 +7168,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 24, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "24:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:24:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 24, "available": true, @@ -8760,7 +7192,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-25-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -8769,22 +7201,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 25, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "25:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:25:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 25, "available": true, @@ -8793,7 +7209,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 13.49, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -8818,22 +7234,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 25, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "25:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:25:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 25, "available": true, @@ -8867,22 +7267,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 25, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "25:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:25:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 25, "available": true, @@ -8915,22 +7299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 25, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "25:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:25:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 25, "available": true, @@ -8963,22 +7331,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 25, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "25:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:25:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 25, "available": true, @@ -9012,22 +7364,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 25, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "25:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:25:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 25, "available": true, @@ -9052,7 +7388,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-26-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -9061,22 +7397,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 26, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "26:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:26:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 26, "available": true, @@ -9085,7 +7405,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 84.08, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -9110,22 +7430,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 26, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "26:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:26:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 26, "available": true, @@ -9159,22 +7463,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 26, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "26:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:26:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 26, "available": true, @@ -9207,22 +7495,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 26, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "26:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:26:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 26, "available": true, @@ -9255,22 +7527,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 26, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "26:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:26:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 26, "available": true, @@ -9304,22 +7560,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 26, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "26:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:26:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 26, "available": true, @@ -9344,7 +7584,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-3-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -9353,22 +7593,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 3, "available": true, @@ -9377,7 +7601,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 39.33, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -9402,22 +7626,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 3, "available": true, @@ -9451,22 +7659,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 3, "available": true, @@ -9499,22 +7691,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 3, "available": true, @@ -9547,22 +7723,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 3, "available": true, @@ -9596,22 +7756,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 3, "available": true, @@ -9636,7 +7780,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-4-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -9645,22 +7789,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 4, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "4:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:4:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 4, "available": true, @@ -9669,7 +7797,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 63.77, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -9694,22 +7822,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 4, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "4:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:4:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 4, "available": true, @@ -9743,22 +7855,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 4, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "4:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:4:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 4, "available": true, @@ -9791,22 +7887,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 4, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "4:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:4:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 4, "available": true, @@ -9839,22 +7919,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 4, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "4:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:4:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 4, "available": true, @@ -9888,22 +7952,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 4, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "4:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:4:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 4, "available": true, @@ -9928,7 +7976,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-5-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -9937,22 +7985,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 5, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "5:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:5:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 5, "available": true, @@ -9961,7 +7993,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 4.37, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -9986,22 +8018,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 5, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "5:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:5:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 5, "available": true, @@ -10035,22 +8051,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 5, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "5:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:5:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 5, "available": true, @@ -10083,22 +8083,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 5, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "5:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:5:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 5, "available": true, @@ -10131,22 +8115,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 5, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "5:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:5:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 5, "available": true, @@ -10180,22 +8148,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 5, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "5:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:5:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 5, "available": true, @@ -10220,7 +8172,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-6-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -10229,22 +8181,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 6, "available": true, @@ -10253,7 +8189,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 31.48, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -10278,22 +8214,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 6, "available": true, @@ -10327,22 +8247,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 6, "available": true, @@ -10375,22 +8279,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 6, "available": true, @@ -10423,22 +8311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 6, "available": true, @@ -10472,22 +8344,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 6, "available": true, @@ -10512,7 +8368,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-7-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -10521,22 +8377,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 7, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "7:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:7:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 7, "available": true, @@ -10545,7 +8385,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 7.6, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -10570,22 +8410,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 7, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "7:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:7:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 7, "available": true, @@ -10619,22 +8443,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 7, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "7:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:7:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 7, "available": true, @@ -10667,22 +8475,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 7, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "7:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:7:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 7, "available": true, @@ -10715,22 +8507,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 7, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "7:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:7:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 7, "available": true, @@ -10764,22 +8540,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 7, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "7:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:7:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 7, "available": true, @@ -10804,7 +8564,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-8-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -10813,22 +8573,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 8, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "8:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:8:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 8, "available": true, @@ -10837,7 +8581,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 2.47, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -10862,22 +8606,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 8, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "8:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:8:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 8, "available": true, @@ -10911,22 +8639,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 8, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "8:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:8:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 8, "available": true, @@ -10959,22 +8671,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 8, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "8:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:8:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 8, "available": true, @@ -11007,22 +8703,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 8, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "8:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:8:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 8, "available": true, @@ -11056,22 +8736,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 8, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "8:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:8:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 8, "available": true, @@ -11096,7 +8760,7 @@ "unique_id": "00:13:a2:00:41:93:fe:df-9-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -11105,22 +8769,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 9, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "9:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:9:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 9, "available": true, @@ -11129,7 +8777,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 63.6, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -11154,22 +8802,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 9, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "9:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:9:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 9, "available": true, @@ -11203,22 +8835,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 9, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "9:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:9:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 9, "available": true, @@ -11251,22 +8867,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 9, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "9:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:9:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 9, "available": true, @@ -11299,22 +8899,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 9, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "9:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:9:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 9, "available": true, @@ -11348,22 +8932,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 9, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "9:0x0b04", - "unique_id": "00:13:a2:00:41:93:fe:df:9:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:41:93:fe:df", "endpoint_id": 9, "available": true, diff --git a/tests/data/devices/isilentllc-masterbed-light-controller.json b/tests/data/devices/isilentllc-masterbed-light-controller.json index ffea7446c..dab8ed0ec 100644 --- a/tests/data/devices/isilentllc-masterbed-light-controller.json +++ b/tests/data/devices/isilentllc-masterbed-light-controller.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:13:a2:00:40:b1:90:06", "nwk": "0x3E49", "manufacturer": "iSilentLLC", @@ -525,22 +525,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 2, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "2:0x000f", - "unique_id": "00:13:a2:00:40:b1:90:06:2:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:13:a2:00:40:b1:90:06", "endpoint_id": 2, "available": true, @@ -568,22 +552,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 3, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "3:0x000f", - "unique_id": "00:13:a2:00:40:b1:90:06:3:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:13:a2:00:40:b1:90:06", "endpoint_id": 3, "available": true, @@ -613,50 +581,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:13:a2:00:40:b1:90:06:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:13:a2:00:40:b1:90:06:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "00:13:a2:00:40:b1:90:06:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:13:a2:00:40:b1:90:06", "endpoint_id": 1, "available": true, @@ -714,22 +638,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 2, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "2:0x000d", - "unique_id": "00:13:a2:00:40:b1:90:06:2:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:13:a2:00:40:b1:90:06", "endpoint_id": 2, "available": true, @@ -761,22 +669,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 3, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "3:0x000d", - "unique_id": "00:13:a2:00:40:b1:90:06:3:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:13:a2:00:40:b1:90:06", "endpoint_id": 3, "available": true, @@ -810,22 +702,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:40:b1:90:06:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:40:b1:90:06", "endpoint_id": 1, "available": true, @@ -854,22 +730,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:40:b1:90:06:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:40:b1:90:06", "endpoint_id": 1, "available": true, @@ -898,22 +758,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 4, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "4:0x0402", - "unique_id": "00:13:a2:00:40:b1:90:06:4:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:13:a2:00:40:b1:90:06", "endpoint_id": 4, "available": true, @@ -942,22 +786,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 4, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "4:0x0405", - "unique_id": "00:13:a2:00:40:b1:90:06:4:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:13:a2:00:40:b1:90:06", "endpoint_id": 4, "available": true, diff --git a/tests/data/devices/isilentllc-safe.json b/tests/data/devices/isilentllc-safe.json index f7d12947d..20285375c 100644 --- a/tests/data/devices/isilentllc-safe.json +++ b/tests/data/devices/isilentllc-safe.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:13:a2:00:41:95:c3:a6", "nwk": "0x8B02", "manufacturer": "iSilentLLC", @@ -380,22 +380,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "00:13:a2:00:41:95:c3:a6:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:13:a2:00:41:95:c3:a6", "endpoint_id": 1, "available": true, @@ -423,22 +407,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 3, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "3:0x0500", - "unique_id": "00:13:a2:00:41:95:c3:a6:3:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:41:95:c3:a6", "endpoint_id": 3, "available": true, @@ -468,50 +436,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "00:13:a2:00:41:95:c3:a6:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 4, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "4:0x0008", - "unique_id": "00:13:a2:00:41:95:c3:a6:4:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 4, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "4:0x0300", - "unique_id": "00:13:a2:00:41:95:c3:a6:4:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:13:a2:00:41:95:c3:a6", "endpoint_id": 4, "available": true, @@ -569,22 +493,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:41:95:c3:a6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:41:95:c3:a6", "endpoint_id": 1, "available": true, @@ -613,22 +521,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:41:95:c3:a6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:41:95:c3:a6", "endpoint_id": 1, "available": true, @@ -657,22 +549,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 2, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "2:0x0402", - "unique_id": "00:13:a2:00:41:95:c3:a6:2:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:13:a2:00:41:95:c3:a6", "endpoint_id": 2, "available": true, @@ -701,22 +577,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 2, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "2:0x0405", - "unique_id": "00:13:a2:00:41:95:c3:a6:2:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:13:a2:00:41:95:c3:a6", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/isilentllc-test-device.json b/tests/data/devices/isilentllc-test-device.json index 8911e8c74..17399e5e2 100644 --- a/tests/data/devices/isilentllc-test-device.json +++ b/tests/data/devices/isilentllc-test-device.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "74:4d:bd:ff:fe:60:7c:c2", "nwk": "0x00A2", "manufacturer": "iSilentLLC", @@ -189,22 +189,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 10, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "10:0x0003", - "unique_id": "74:4d:bd:ff:fe:60:7c:c2:10:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "74:4d:bd:ff:fe:60:7c:c2", "endpoint_id": 10, "available": true, @@ -237,22 +221,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 10, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "10:0x0000", - "unique_id": "74:4d:bd:ff:fe:60:7c:c2:10:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "74:4d:bd:ff:fe:60:7c:c2", "endpoint_id": 10, "available": true, @@ -281,22 +249,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 10, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "10:0x0000", - "unique_id": "74:4d:bd:ff:fe:60:7c:c2:10:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "74:4d:bd:ff:fe:60:7c:c2", "endpoint_id": 10, "available": true, @@ -327,22 +279,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 10, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "10:0x0006", - "unique_id": "74:4d:bd:ff:fe:60:7c:c2:10:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "74:4d:bd:ff:fe:60:7c:c2", "endpoint_id": 10, "available": true, @@ -369,22 +305,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "74:4d:bd:ff:fe:60:7c:c2:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "74:4d:bd:ff:fe:60:7c:c2", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/isilentllc-test-mule.json b/tests/data/devices/isilentllc-test-mule.json index b13f8fc08..4d80b3118 100644 --- a/tests/data/devices/isilentllc-test-mule.json +++ b/tests/data/devices/isilentllc-test-mule.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "74:4d:bd:ff:fe:60:7c:80", "nwk": "0xD53C", "manufacturer": "iSilentLLC", @@ -165,22 +165,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "74:4d:bd:ff:fe:60:7c:80:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "74:4d:bd:ff:fe:60:7c:80", "endpoint_id": 1, "available": true, @@ -210,22 +194,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "74:4d:bd:ff:fe:60:7c:80:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "74:4d:bd:ff:fe:60:7c:80", "endpoint_id": 1, "available": true, @@ -258,22 +226,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "74:4d:bd:ff:fe:60:7c:80:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "74:4d:bd:ff:fe:60:7c:80", "endpoint_id": 1, "available": true, @@ -302,22 +254,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "74:4d:bd:ff:fe:60:7c:80:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "74:4d:bd:ff:fe:60:7c:80", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/isilentllc-water-heater.json b/tests/data/devices/isilentllc-water-heater.json index 9b6e02a20..73c1def36 100644 --- a/tests/data/devices/isilentllc-water-heater.json +++ b/tests/data/devices/isilentllc-water-heater.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:13:a2:00:40:c0:4d:cb", "nwk": "0x6100", "manufacturer": "iSilentLLC", @@ -333,22 +333,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:40:c0:4d:cb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:40:c0:4d:cb", "endpoint_id": 1, "available": true, @@ -377,22 +361,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:13:a2:00:40:c0:4d:cb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:13:a2:00:40:c0:4d:cb", "endpoint_id": 1, "available": true, @@ -421,22 +389,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:13:a2:00:40:c0:4d:cb:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:40:c0:4d:cb", "endpoint_id": 1, "available": true, @@ -471,22 +423,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:13:a2:00:40:c0:4d:cb:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:40:c0:4d:cb", "endpoint_id": 1, "available": true, @@ -520,22 +456,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:13:a2:00:40:c0:4d:cb:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:13:a2:00:40:c0:4d:cb", "endpoint_id": 1, "available": true, @@ -570,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 2, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "2:0x0402", - "unique_id": "00:13:a2:00:40:c0:4d:cb:2:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:13:a2:00:40:c0:4d:cb", "endpoint_id": 2, "available": true, @@ -614,22 +518,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 3, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "3:0x0402", - "unique_id": "00:13:a2:00:40:c0:4d:cb:3:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:13:a2:00:40:c0:4d:cb", "endpoint_id": 3, "available": true, @@ -660,22 +548,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:13:a2:00:40:c0:4d:cb:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:13:a2:00:40:c0:4d:cb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/jasco-products-45856.json b/tests/data/devices/jasco-products-45856.json index 2b696e074..84c624e17 100644 --- a/tests/data/devices/jasco-products-45856.json +++ b/tests/data/devices/jasco-products-45856.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:22:a3:00:00:26:d3:61", "nwk": "0xB811", "manufacturer": "Jasco Products", @@ -338,22 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:22:a3:00:00:26:d3:61:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:26:d3:61", "endpoint_id": 1, "available": true, @@ -386,22 +370,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:22:a3:00:00:26:d3:61:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:22:a3:00:00:26:d3:61", "endpoint_id": 1, "available": true, @@ -454,22 +422,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:22:a3:00:00:26:d3:61:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:26:d3:61", "endpoint_id": 1, "available": true, @@ -498,22 +450,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:22:a3:00:00:26:d3:61:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:26:d3:61", "endpoint_id": 1, "available": true, @@ -542,22 +478,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "00:22:a3:00:00:26:d3:61:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:22:a3:00:00:26:d3:61", "endpoint_id": 1, "available": true, @@ -594,22 +514,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "00:22:a3:00:00:26:d3:61:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:22:a3:00:00:26:d3:61", "endpoint_id": 1, "available": true, @@ -648,22 +552,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:22:a3:00:00:26:d3:61:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:26:d3:61", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/jasco-products-45857.json b/tests/data/devices/jasco-products-45857.json index be1319d60..b91a42533 100644 --- a/tests/data/devices/jasco-products-45857.json +++ b/tests/data/devices/jasco-products-45857.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:22:a3:00:00:25:2c:24", "nwk": "0x68BB", "manufacturer": "Jasco Products", @@ -393,22 +393,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:22:a3:00:00:25:2c:24:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:25:2c:24", "endpoint_id": 1, "available": true, @@ -441,36 +425,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:22:a3:00:00:25:2c:24:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:22:a3:00:00:25:2c:24:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:22:a3:00:00:25:2c:24", "endpoint_id": 1, "available": true, @@ -524,22 +478,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:22:a3:00:00:25:2c:24:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:22:a3:00:00:25:2c:24", "endpoint_id": 1, "available": true, @@ -573,22 +511,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:22:a3:00:00:25:2c:24:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:25:2c:24", "endpoint_id": 1, "available": true, @@ -617,22 +539,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:22:a3:00:00:25:2c:24:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:25:2c:24", "endpoint_id": 1, "available": true, @@ -661,22 +567,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "00:22:a3:00:00:25:2c:24:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:22:a3:00:00:25:2c:24", "endpoint_id": 1, "available": true, @@ -713,22 +603,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "00:22:a3:00:00:25:2c:24:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:22:a3:00:00:25:2c:24", "endpoint_id": 1, "available": true, @@ -767,22 +641,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:22:a3:00:00:25:2c:24:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:25:2c:24", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ke-tradfri-open-close-remote.json b/tests/data/devices/ke-tradfri-open-close-remote.json index f8b812e21..ee12a939f 100644 --- a/tests/data/devices/ke-tradfri-open-close-remote.json +++ b/tests/data/devices/ke-tradfri-open-close-remote.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "5c:02:72:ff:fe:96:48:04", "nwk": "0x3A36", "manufacturer": "\u0002KE", @@ -235,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "5c:02:72:ff:fe:96:48:04:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:96:48:04", "endpoint_id": 1, "available": true, @@ -283,22 +267,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "5c:02:72:ff:fe:96:48:04:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:96:48:04", "endpoint_id": 1, "available": true, @@ -327,22 +295,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "5c:02:72:ff:fe:96:48:04:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:96:48:04", "endpoint_id": 1, "available": true, @@ -371,22 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "5c:02:72:ff:fe:96:48:04:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "5c:02:72:ff:fe:96:48:04", "endpoint_id": 1, "available": true, @@ -425,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "5c:02:72:ff:fe:96:48:04:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:96:48:04", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/keen-home-inc-sv01-410-mp-1-1.json b/tests/data/devices/keen-home-inc-sv01-410-mp-1-1.json index 145b84049..f48a8e5a6 100644 --- a/tests/data/devices/keen-home-inc-sv01-410-mp-1-1.json +++ b/tests/data/devices/keen-home-inc-sv01-410-mp-1-1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:fe:6b:5b:c9", "nwk": "0xB4B7", "manufacturer": "Keen Home Inc", @@ -285,22 +285,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:fe:6b:5b:c9:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fe:6b:5b:c9", "endpoint_id": 1, "available": true, @@ -333,36 +317,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fe:6b:5b:c9:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:fe:6b:5b:c9:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:fe:6b:5b:c9", "endpoint_id": 1, "available": true, @@ -393,22 +347,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fe:6b:5b:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fe:6b:5b:c9", "endpoint_id": 1, "available": true, @@ -437,22 +375,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fe:6b:5b:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fe:6b:5b:c9", "endpoint_id": 1, "available": true, @@ -481,22 +403,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:fe:6b:5b:c9:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:fe:6b:5b:c9", "endpoint_id": 1, "available": true, @@ -533,22 +439,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:fe:6b:5b:c9:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:fe:6b:5b:c9", "endpoint_id": 1, "available": true, @@ -577,22 +467,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PressureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0403", - "endpoint_id": 1, - "cluster": { - "id": 1027, - "name": "Pressure Measurement", - "type": "server" - }, - "id": "1:0x0403", - "unique_id": "ab:cd:ef:12:fe:6b:5b:c9:1:0x0403", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:fe:6b:5b:c9", "endpoint_id": 1, "available": true, @@ -623,22 +497,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:fe:6b:5b:c9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fe:6b:5b:c9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/keen-home-inc-sv02-610-mp-1-3.json b/tests/data/devices/keen-home-inc-sv02-610-mp-1-3.json index 6c9a2ea5d..60645e422 100644 --- a/tests/data/devices/keen-home-inc-sv02-610-mp-1-3.json +++ b/tests/data/devices/keen-home-inc-sv02-610-mp-1-3.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0b:57:ff:fe:81:48:29", "nwk": "0x2583", "manufacturer": "Keen Home Inc", @@ -242,22 +242,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0b:57:ff:fe:81:48:29:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:81:48:29", "endpoint_id": 1, "available": true, @@ -290,36 +274,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0b:57:ff:fe:81:48:29:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:81:48:29:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:81:48:29", "endpoint_id": 1, "available": true, @@ -350,22 +304,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:81:48:29:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:81:48:29", "endpoint_id": 1, "available": true, @@ -394,22 +332,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:81:48:29:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:81:48:29", "endpoint_id": 1, "available": true, @@ -438,22 +360,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0b:57:ff:fe:81:48:29:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0b:57:ff:fe:81:48:29", "endpoint_id": 1, "available": true, @@ -490,22 +396,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "00:0b:57:ff:fe:81:48:29:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:0b:57:ff:fe:81:48:29", "endpoint_id": 1, "available": true, @@ -534,22 +424,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PressureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0403", - "endpoint_id": 1, - "cluster": { - "id": 1027, - "name": "Pressure Measurement", - "type": "server" - }, - "id": "1:0x0403", - "unique_id": "00:0b:57:ff:fe:81:48:29:1:0x0403", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:0b:57:ff:fe:81:48:29", "endpoint_id": 1, "available": true, @@ -580,22 +454,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0b:57:ff:fe:81:48:29:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:81:48:29", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/keen-home-inc-sv02-612-mp-1-3.json b/tests/data/devices/keen-home-inc-sv02-612-mp-1-3.json index 74719c580..113c646a4 100644 --- a/tests/data/devices/keen-home-inc-sv02-612-mp-1-3.json +++ b/tests/data/devices/keen-home-inc-sv02-612-mp-1-3.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0b:57:ff:fe:92:e6:e4", "nwk": "0xBFC1", "manufacturer": "Keen Home Inc", @@ -291,22 +291,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0b:57:ff:fe:92:e6:e4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:92:e6:e4", "endpoint_id": 1, "available": true, @@ -339,36 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0b:57:ff:fe:92:e6:e4:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:0b:57:ff:fe:92:e6:e4:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:0b:57:ff:fe:92:e6:e4", "endpoint_id": 1, "available": true, @@ -399,22 +353,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:92:e6:e4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:92:e6:e4", "endpoint_id": 1, "available": true, @@ -443,22 +381,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0b:57:ff:fe:92:e6:e4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:92:e6:e4", "endpoint_id": 1, "available": true, @@ -487,22 +409,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0b:57:ff:fe:92:e6:e4:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0b:57:ff:fe:92:e6:e4", "endpoint_id": 1, "available": true, @@ -539,22 +445,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "00:0b:57:ff:fe:92:e6:e4:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:0b:57:ff:fe:92:e6:e4", "endpoint_id": 1, "available": true, @@ -583,22 +473,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PressureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0403", - "endpoint_id": 1, - "cluster": { - "id": 1027, - "name": "Pressure Measurement", - "type": "server" - }, - "id": "1:0x0403", - "unique_id": "00:0b:57:ff:fe:92:e6:e4:1:0x0403", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:0b:57:ff:fe:92:e6:e4", "endpoint_id": 1, "available": true, @@ -629,22 +503,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0b:57:ff:fe:92:e6:e4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0b:57:ff:fe:92:e6:e4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/king-of-fans-inc-hbuniversalcfremote.json b/tests/data/devices/king-of-fans-inc-hbuniversalcfremote.json index 0e82149a0..89f420ea0 100644 --- a/tests/data/devices/king-of-fans-inc-hbuniversalcfremote.json +++ b/tests/data/devices/king-of-fans-inc-hbuniversalcfremote.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:22:a3:00:00:09:ad:41", "nwk": "0x6F7E", "manufacturer": "King Of Fans, Inc.", @@ -235,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "KofIdentify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:22:a3:00:00:09:ad:41:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:09:ad:41", "endpoint_id": 1, "available": true, @@ -283,22 +267,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "FanClusterHandler", - "generic_id": "cluster_handler_0x0202", - "endpoint_id": 1, - "cluster": { - "id": 514, - "name": "Fan Control", - "type": "server" - }, - "id": "1:0x0202", - "unique_id": "00:22:a3:00:00:09:ad:41:1:0x0202", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:09:ad:41", "endpoint_id": 1, "available": true, @@ -342,36 +310,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:22:a3:00:00:09:ad:41:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:22:a3:00:00:09:ad:41:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:22:a3:00:00:09:ad:41", "endpoint_id": 1, "available": true, @@ -425,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:22:a3:00:00:09:ad:41:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:22:a3:00:00:09:ad:41", "endpoint_id": 1, "available": true, @@ -474,22 +396,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "KofBasic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:22:a3:00:00:09:ad:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:09:ad:41", "endpoint_id": 1, "available": true, @@ -518,22 +424,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "KofBasic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:22:a3:00:00:09:ad:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:09:ad:41", "endpoint_id": 1, "available": true, @@ -564,22 +454,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:22:a3:00:00:09:ad:41:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:09:ad:41", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/king-of-fans-inc-hdc52eastwindfan.json b/tests/data/devices/king-of-fans-inc-hdc52eastwindfan.json index ac2cd2f28..9b192d211 100644 --- a/tests/data/devices/king-of-fans-inc-hdc52eastwindfan.json +++ b/tests/data/devices/king-of-fans-inc-hdc52eastwindfan.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:22:a3:00:00:27:48:84", "nwk": "0x770B", "manufacturer": "King Of Fans, Inc.", @@ -241,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "KofIdentify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:22:a3:00:00:27:48:84:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:27:48:84", "endpoint_id": 1, "available": true, @@ -289,22 +273,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "FanClusterHandler", - "generic_id": "cluster_handler_0x0202", - "endpoint_id": 1, - "cluster": { - "id": 514, - "name": "Fan Control", - "type": "server" - }, - "id": "1:0x0202", - "unique_id": "00:22:a3:00:00:27:48:84:1:0x0202", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:27:48:84", "endpoint_id": 1, "available": true, @@ -348,36 +316,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:22:a3:00:00:27:48:84:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:22:a3:00:00:27:48:84:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:22:a3:00:00:27:48:84", "endpoint_id": 1, "available": true, @@ -431,22 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "00:22:a3:00:00:27:48:84:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:22:a3:00:00:27:48:84", "endpoint_id": 1, "available": true, @@ -480,22 +402,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "KofBasic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:22:a3:00:00:27:48:84:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:27:48:84", "endpoint_id": 1, "available": true, @@ -524,22 +430,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "KofBasic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:22:a3:00:00:27:48:84:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:27:48:84", "endpoint_id": 1, "available": true, @@ -570,22 +460,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:22:a3:00:00:27:48:84:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:22:a3:00:00:27:48:84", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/konke-3afe140103020000.json b/tests/data/devices/konke-3afe140103020000.json index e236f1180..b3d6bac3a 100644 --- a/tests/data/devices/konke-3afe140103020000.json +++ b/tests/data/devices/konke-3afe140103020000.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "08:6b:d7:ff:fe:91:5f:7a", "nwk": "0x18D8", "manufacturer": "Konke", @@ -180,22 +180,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "08:6b:d7:ff:fe:91:5f:7a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:7a", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "08:6b:d7:ff:fe:91:5f:7a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:7a", "endpoint_id": 1, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "08:6b:d7:ff:fe:91:5f:7a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:7a", "endpoint_id": 1, "available": true, @@ -316,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "08:6b:d7:ff:fe:91:5f:7a:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:7a", "endpoint_id": 1, "available": true, @@ -367,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "08:6b:d7:ff:fe:91:5f:7a:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:7a", "endpoint_id": 1, "available": true, @@ -411,22 +331,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "08:6b:d7:ff:fe:91:5f:7a:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:7a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/konke-3afe220103020000.json b/tests/data/devices/konke-3afe220103020000.json index 3fcc8b006..182bb5fab 100644 --- a/tests/data/devices/konke-3afe220103020000.json +++ b/tests/data/devices/konke-3afe220103020000.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "08:6b:d7:ff:fe:91:5f:d1", "nwk": "0x80AE", "manufacturer": "Konke", @@ -180,22 +180,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "08:6b:d7:ff:fe:91:5f:d1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:d1", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "08:6b:d7:ff:fe:91:5f:d1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:d1", "endpoint_id": 1, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "08:6b:d7:ff:fe:91:5f:d1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:d1", "endpoint_id": 1, "available": true, @@ -316,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "08:6b:d7:ff:fe:91:5f:d1:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:d1", "endpoint_id": 1, "available": true, @@ -367,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "08:6b:d7:ff:fe:91:5f:d1:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:d1", "endpoint_id": 1, "available": true, @@ -411,22 +331,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "08:6b:d7:ff:fe:91:5f:d1:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "08:6b:d7:ff:fe:91:5f:d1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/konke-3afe270104020015.json b/tests/data/devices/konke-3afe270104020015.json index 05185cc9f..3e12de8fd 100644 --- a/tests/data/devices/konke-3afe270104020015.json +++ b/tests/data/devices/konke-3afe270104020015.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "08:6b:d7:ff:fe:e9:73:96", "nwk": "0xC844", "manufacturer": "Konke", @@ -206,22 +206,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "08:6b:d7:ff:fe:e9:73:96:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "08:6b:d7:ff:fe:e9:73:96", "endpoint_id": 1, "available": true, @@ -251,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "08:6b:d7:ff:fe:e9:73:96:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "08:6b:d7:ff:fe:e9:73:96", "endpoint_id": 1, "available": true, @@ -299,22 +267,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "08:6b:d7:ff:fe:e9:73:96:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "08:6b:d7:ff:fe:e9:73:96", "endpoint_id": 1, "available": true, @@ -343,22 +295,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "08:6b:d7:ff:fe:e9:73:96:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "08:6b:d7:ff:fe:e9:73:96", "endpoint_id": 1, "available": true, @@ -387,22 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "08:6b:d7:ff:fe:e9:73:96:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "08:6b:d7:ff:fe:e9:73:96", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/konke-3afe280100510001.json b/tests/data/devices/konke-3afe280100510001.json index 8463e08d0..87b5169ac 100644 --- a/tests/data/devices/konke-3afe280100510001.json +++ b/tests/data/devices/konke-3afe280100510001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "14:b4:57:ff:fe:07:59:0a", "nwk": "0x36DB", "manufacturer": "Konke", @@ -181,22 +181,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "14:b4:57:ff:fe:07:59:0a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:07:59:0a", "endpoint_id": 1, "available": true, @@ -229,22 +213,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:b4:57:ff:fe:07:59:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:07:59:0a", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:b4:57:ff:fe:07:59:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:07:59:0a", "endpoint_id": 1, "available": true, @@ -317,22 +269,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "14:b4:57:ff:fe:07:59:0a:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "14:b4:57:ff:fe:07:59:0a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/konke-3afe28010402000d.json b/tests/data/devices/konke-3afe28010402000d.json index a261d44c5..ad6f1ced9 100755 --- a/tests/data/devices/konke-3afe28010402000d.json +++ b/tests/data/devices/konke-3afe28010402000d.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "14:b4:57:ff:fe:07:70:fb", "nwk": "0x2660", "manufacturer": "Konke", @@ -218,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "14:b4:57:ff:fe:07:70:fb:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "14:b4:57:ff:fe:07:70:fb", "endpoint_id": 1, "available": true, @@ -261,22 +245,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "14:b4:57:ff:fe:07:70:fb:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:07:70:fb", "endpoint_id": 1, "available": true, @@ -306,22 +274,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "14:b4:57:ff:fe:07:70:fb:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:07:70:fb", "endpoint_id": 1, "available": true, @@ -354,22 +306,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:b4:57:ff:fe:07:70:fb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:07:70:fb", "endpoint_id": 1, "available": true, @@ -398,22 +334,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:b4:57:ff:fe:07:70:fb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:07:70:fb", "endpoint_id": 1, "available": true, @@ -442,22 +362,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "14:b4:57:ff:fe:07:70:fb:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "14:b4:57:ff:fe:07:70:fb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/kwikset-smartcode-convert-gen1.json b/tests/data/devices/kwikset-smartcode-convert-gen1.json index 64d968a67..517d9f679 100644 --- a/tests/data/devices/kwikset-smartcode-convert-gen1.json +++ b/tests/data/devices/kwikset-smartcode-convert-gen1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:24:46:ff:fd:03:83:d9", "nwk": "0x80A9", "manufacturer": "Kwikset", @@ -272,22 +272,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 2, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "2:0x0003", - "unique_id": "00:24:46:ff:fd:03:83:d9:2:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:24:46:ff:fd:03:83:d9", "endpoint_id": 2, "available": true, @@ -320,22 +304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "DoorLockClusterHandler", - "generic_id": "cluster_handler_0x0101", - "endpoint_id": 2, - "cluster": { - "id": 257, - "name": "Door Lock", - "type": "server" - }, - "id": "2:0x0101", - "unique_id": "00:24:46:ff:fd:03:83:d9:2:0x0101", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:24:46:ff:fd:03:83:d9", "endpoint_id": 2, "available": true, @@ -364,22 +332,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "00:24:46:ff:fd:03:83:d9:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:24:46:ff:fd:03:83:d9", "endpoint_id": 2, "available": true, @@ -408,22 +360,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "00:24:46:ff:fd:03:83:d9:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:24:46:ff:fd:03:83:d9", "endpoint_id": 2, "available": true, @@ -452,22 +388,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "00:24:46:ff:fd:03:83:d9:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:24:46:ff:fd:03:83:d9", "endpoint_id": 2, "available": true, @@ -504,22 +424,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 2, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "2:0x0402", - "unique_id": "00:24:46:ff:fd:03:83:d9:2:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:24:46:ff:fd:03:83:d9", "endpoint_id": 2, "available": true, @@ -550,22 +454,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "00:24:46:ff:fd:03:83:d9:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:24:46:ff:fd:03:83:d9", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/lds-zb-onoffplug-d0005.json b/tests/data/devices/lds-zb-onoffplug-d0005.json index d68b59a7e..d8d945965 100644 --- a/tests/data/devices/lds-zb-onoffplug-d0005.json +++ b/tests/data/devices/lds-zb-onoffplug-d0005.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ab:48:5a:2c", "nwk": "0x78CB", "manufacturer": "LDS", @@ -402,22 +402,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ab:48:5a:2c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:48:5a:2c", "endpoint_id": 1, "available": true, @@ -450,22 +434,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ab:48:5a:2c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ab:48:5a:2c", "endpoint_id": 1, "available": true, @@ -501,22 +469,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ab:48:5a:2c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:48:5a:2c", "endpoint_id": 1, "available": true, @@ -545,22 +497,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ab:48:5a:2c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:48:5a:2c", "endpoint_id": 1, "available": true, @@ -589,22 +525,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:ab:48:5a:2c:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:ab:48:5a:2c", "endpoint_id": 1, "available": true, @@ -631,7 +551,7 @@ "unique_id": "ab:cd:ef:12:ab:48:5a:2c-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -640,22 +560,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ab:48:5a:2c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ab:48:5a:2c", "endpoint_id": 1, "available": true, @@ -664,7 +568,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 67.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -689,22 +593,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ab:48:5a:2c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ab:48:5a:2c", "endpoint_id": 1, "available": true, @@ -738,22 +626,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ab:48:5a:2c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ab:48:5a:2c", "endpoint_id": 1, "available": true, @@ -789,22 +661,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ab:48:5a:2c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ab:48:5a:2c", "endpoint_id": 1, "available": true, @@ -833,22 +689,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ab:48:5a:2c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:48:5a:2c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lds-zbt-cctswitch-d0001.json b/tests/data/devices/lds-zbt-cctswitch-d0001.json index e276411ab..dd2fd903f 100644 --- a/tests/data/devices/lds-zbt-cctswitch-d0001.json +++ b/tests/data/devices/lds-zbt-cctswitch-d0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "14:b4:57:ff:fe:81:56:33", "nwk": "0xCBDB", "manufacturer": "LDS", @@ -215,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "14:b4:57:ff:fe:81:56:33:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:81:56:33", "endpoint_id": 1, "available": true, @@ -263,22 +247,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:b4:57:ff:fe:81:56:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:81:56:33", "endpoint_id": 1, "available": true, @@ -307,22 +275,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:b4:57:ff:fe:81:56:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:81:56:33", "endpoint_id": 1, "available": true, @@ -351,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "14:b4:57:ff:fe:81:56:33:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "14:b4:57:ff:fe:81:56:33", "endpoint_id": 1, "available": true, @@ -405,22 +341,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "14:b4:57:ff:fe:81:56:33:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:81:56:33", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ledvance-a60s-rgbw.json b/tests/data/devices/ledvance-a60s-rgbw.json index b89c26e5e..459520f37 100644 --- a/tests/data/devices/ledvance-a60s-rgbw.json +++ b/tests/data/devices/ledvance-a60s-rgbw.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:43:dd:e3:9b", "nwk": "0xF4D9", "manufacturer": "LEDVANCE", @@ -694,22 +694,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:43:dd:e3:9b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:dd:e3:9b", "endpoint_id": 1, "available": true, @@ -742,50 +726,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:43:dd:e3:9b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:43:dd:e3:9b:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:43:dd:e3:9b:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:43:dd:e3:9b", "endpoint_id": 1, "available": true, @@ -846,22 +786,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:43:dd:e3:9b:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:43:dd:e3:9b", "endpoint_id": 1, "available": true, @@ -893,22 +817,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:43:dd:e3:9b:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:43:dd:e3:9b", "endpoint_id": 1, "available": true, @@ -940,22 +848,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:43:dd:e3:9b:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:43:dd:e3:9b", "endpoint_id": 1, "available": true, @@ -989,22 +881,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:43:dd:e3:9b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:dd:e3:9b", "endpoint_id": 1, "available": true, @@ -1033,22 +909,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:43:dd:e3:9b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:dd:e3:9b", "endpoint_id": 1, "available": true, @@ -1079,22 +939,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:43:dd:e3:9b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:dd:e3:9b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ledvance-flex-rgbw.json b/tests/data/devices/ledvance-flex-rgbw.json index f634b6778..a501e1b86 100755 --- a/tests/data/devices/ledvance-flex-rgbw.json +++ b/tests/data/devices/ledvance-flex-rgbw.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "f0:d1:b8:00:00:00:6b:f5", "nwk": "0x3D7F", "manufacturer": "LEDVANCE", @@ -337,22 +337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:00:6b:f5", "endpoint_id": 1, "available": true, @@ -385,50 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "f0:d1:b8:00:00:00:6b:f5", "endpoint_id": 1, "available": true, @@ -487,22 +427,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "f0:d1:b8:00:00:00:6b:f5", "endpoint_id": 1, "available": true, @@ -534,22 +458,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "f0:d1:b8:00:00:00:6b:f5", "endpoint_id": 1, "available": true, @@ -581,22 +489,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "f0:d1:b8:00:00:00:6b:f5", "endpoint_id": 1, "available": true, @@ -628,22 +520,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "f0:d1:b8:00:00:00:6b:f5", "endpoint_id": 1, "available": true, @@ -675,22 +551,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "f0:d1:b8:00:00:00:6b:f5", "endpoint_id": 1, "available": true, @@ -724,22 +584,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:00:6b:f5", "endpoint_id": 1, "available": true, @@ -768,22 +612,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:00:6b:f5", "endpoint_id": 1, "available": true, @@ -814,22 +642,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "f0:d1:b8:00:00:00:6b:f5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:00:6b:f5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ledvance-outdoor-accent-light-rgb.json b/tests/data/devices/ledvance-outdoor-accent-light-rgb.json index 5953bdcdb..a6d597859 100644 --- a/tests/data/devices/ledvance-outdoor-accent-light-rgb.json +++ b/tests/data/devices/ledvance-outdoor-accent-light-rgb.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "f0:d1:b8:00:00:07:83:8e", "nwk": "0x6404", "manufacturer": "LEDVANCE", @@ -313,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:07:83:8e", "endpoint_id": 1, "available": true, @@ -361,50 +345,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "f0:d1:b8:00:00:07:83:8e", "endpoint_id": 1, "available": true, @@ -463,22 +403,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "f0:d1:b8:00:00:07:83:8e", "endpoint_id": 1, "available": true, @@ -510,22 +434,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "f0:d1:b8:00:00:07:83:8e", "endpoint_id": 1, "available": true, @@ -557,22 +465,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "f0:d1:b8:00:00:07:83:8e", "endpoint_id": 1, "available": true, @@ -604,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "f0:d1:b8:00:00:07:83:8e", "endpoint_id": 1, "available": true, @@ -651,22 +527,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "f0:d1:b8:00:00:07:83:8e", "endpoint_id": 1, "available": true, @@ -700,22 +560,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:07:83:8e", "endpoint_id": 1, "available": true, @@ -744,22 +588,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:07:83:8e", "endpoint_id": 1, "available": true, @@ -790,22 +618,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "f0:d1:b8:00:00:07:83:8e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:07:83:8e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ledvance-plug.json b/tests/data/devices/ledvance-plug.json index 5a37b6fb3..87417abf4 100644 --- a/tests/data/devices/ledvance-plug.json +++ b/tests/data/devices/ledvance-plug.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "f0:d1:b8:00:00:05:49:22", "nwk": "0xEE12", "manufacturer": "LEDVANCE", @@ -197,22 +197,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "f0:d1:b8:00:00:05:49:22:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:05:49:22", "endpoint_id": 1, "available": true, @@ -245,22 +229,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f0:d1:b8:00:00:05:49:22:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:05:49:22", "endpoint_id": 1, "available": true, @@ -289,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "f0:d1:b8:00:00:05:49:22:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:05:49:22", "endpoint_id": 1, "available": true, @@ -335,22 +287,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "f0:d1:b8:00:00:05:49:22:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "f0:d1:b8:00:00:05:49:22", "endpoint_id": 1, "available": true, @@ -379,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "f0:d1:b8:00:00:05:49:22:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f0:d1:b8:00:00:05:49:22", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/legrand-contactor.json b/tests/data/devices/legrand-contactor.json index 05c0aca83..76377372d 100644 --- a/tests/data/devices/legrand-contactor.json +++ b/tests/data/devices/legrand-contactor.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:0d:ab:89:6b", "nwk": "0x30DD", "manufacturer": " Legrand", @@ -537,22 +537,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, @@ -580,22 +564,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, @@ -625,22 +593,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, @@ -673,22 +625,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, @@ -724,22 +660,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, @@ -768,22 +688,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, @@ -803,7 +707,7 @@ "unique_id": "ab:cd:ef:12:0d:ab:89:6b-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -812,22 +716,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, @@ -836,7 +724,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -861,22 +749,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, @@ -909,22 +781,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, @@ -958,22 +814,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, @@ -1009,22 +849,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, @@ -1053,22 +877,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:0d:ab:89:6b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0d:ab:89:6b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/legrand-dimmer-switch-w-o-neutral.json b/tests/data/devices/legrand-dimmer-switch-w-o-neutral.json index 89e11d561..2968999d6 100644 --- a/tests/data/devices/legrand-dimmer-switch-w-o-neutral.json +++ b/tests/data/devices/legrand-dimmer-switch-w-o-neutral.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b1:5a:79:5a", "nwk": "0xFD5E", "manufacturer": " Legrand", @@ -347,22 +347,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -390,22 +374,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -435,22 +403,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -483,36 +435,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -566,22 +488,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -613,22 +519,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -660,22 +550,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -707,22 +581,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -754,22 +612,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -801,22 +643,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -850,22 +676,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -901,22 +711,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -945,22 +739,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, @@ -991,22 +769,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b1:5a:79:5a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:5a:79:5a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/legrand-double-gangs-remote-switch.json b/tests/data/devices/legrand-double-gangs-remote-switch.json index 348f7d11c..992b04ebc 100644 --- a/tests/data/devices/legrand-double-gangs-remote-switch.json +++ b/tests/data/devices/legrand-double-gangs-remote-switch.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b6:14:95:c6", "nwk": "0x8014", "manufacturer": " Legrand", @@ -273,22 +273,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 2, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "2:0x000f", - "unique_id": "ab:cd:ef:12:b6:14:95:c6:2:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:b6:14:95:c6", "endpoint_id": 2, "available": true, @@ -318,22 +302,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:b6:14:95:c6:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b6:14:95:c6", "endpoint_id": 1, "available": true, @@ -366,22 +334,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b6:14:95:c6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b6:14:95:c6", "endpoint_id": 1, "available": true, @@ -410,22 +362,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b6:14:95:c6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b6:14:95:c6", "endpoint_id": 1, "available": true, @@ -454,22 +390,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:b6:14:95:c6:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:b6:14:95:c6", "endpoint_id": 1, "available": true, @@ -506,22 +426,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b6:14:95:c6:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b6:14:95:c6", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/legrand-light-switch-with-neutral.json b/tests/data/devices/legrand-light-switch-with-neutral.json index 8cb2939a1..060ce5d46 100644 --- a/tests/data/devices/legrand-light-switch-with-neutral.json +++ b/tests/data/devices/legrand-light-switch-with-neutral.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:39:bc:b5:2d", "nwk": "0x8540", "manufacturer": " Legrand", @@ -247,22 +247,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "ab:cd:ef:12:39:bc:b5:2d:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:39:bc:b5:2d", "endpoint_id": 1, "available": true, @@ -292,22 +276,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "LegrandIdentify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:39:bc:b5:2d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:bc:b5:2d", "endpoint_id": 1, "available": true, @@ -340,22 +308,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:39:bc:b5:2d:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:39:bc:b5:2d", "endpoint_id": 1, "available": true, @@ -408,22 +360,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:39:bc:b5:2d:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:39:bc:b5:2d", "endpoint_id": 1, "available": true, @@ -459,22 +395,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:bc:b5:2d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:bc:b5:2d", "endpoint_id": 1, "available": true, @@ -503,22 +423,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:bc:b5:2d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:bc:b5:2d", "endpoint_id": 1, "available": true, @@ -549,22 +453,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc01", - "endpoint_id": 1, - "cluster": { - "id": 64513, - "name": "LegrandCluster", - "type": "server" - }, - "id": "1:0xfc01", - "unique_id": "ab:cd:ef:12:39:bc:b5:2d:1:0xfc01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:bc:b5:2d", "endpoint_id": 1, "available": true, @@ -597,22 +485,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc01", - "endpoint_id": 1, - "cluster": { - "id": 64513, - "name": "LegrandCluster", - "type": "server" - }, - "id": "1:0xfc01", - "unique_id": "ab:cd:ef:12:39:bc:b5:2d:1:0xfc01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:bc:b5:2d", "endpoint_id": 1, "available": true, @@ -647,22 +519,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:39:bc:b5:2d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:bc:b5:2d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/legrand-mobile-outlet.json b/tests/data/devices/legrand-mobile-outlet.json index f2257b898..b44c140e7 100644 --- a/tests/data/devices/legrand-mobile-outlet.json +++ b/tests/data/devices/legrand-mobile-outlet.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:00:e8:bc:6f", "nwk": "0xAA72", "manufacturer": " Legrand", @@ -629,22 +629,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, @@ -672,22 +656,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, @@ -717,22 +685,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, @@ -765,22 +717,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, @@ -816,22 +752,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, @@ -860,22 +780,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, @@ -895,7 +799,7 @@ "unique_id": "ab:cd:ef:12:00:e8:bc:6f-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -904,22 +808,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, @@ -928,7 +816,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 13.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -953,22 +841,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, @@ -1001,22 +873,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, @@ -1050,22 +906,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, @@ -1101,22 +941,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, @@ -1145,22 +969,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:00:e8:bc:6f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:e8:bc:6f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/level-home-b2.json b/tests/data/devices/level-home-b2.json index d69326fc7..6e1853779 100644 --- a/tests/data/devices/level-home-b2.json +++ b/tests/data/devices/level-home-b2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "f4:ce:36:13:82:67:19:59", "nwk": "0xE268", "manufacturer": "Level Home", @@ -367,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 10, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "10:0x0003", - "unique_id": "f4:ce:36:13:82:67:19:59:10:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:13:82:67:19:59", "endpoint_id": 10, "available": true, @@ -415,22 +399,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "DoorLockClusterHandler", - "generic_id": "cluster_handler_0x0101", - "endpoint_id": 10, - "cluster": { - "id": 257, - "name": "Door Lock", - "type": "server" - }, - "id": "10:0x0101", - "unique_id": "f4:ce:36:13:82:67:19:59:10:0x0101", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:13:82:67:19:59", "endpoint_id": 10, "available": true, @@ -459,22 +427,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 10, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "10:0x0001", - "unique_id": "f4:ce:36:13:82:67:19:59:10:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "f4:ce:36:13:82:67:19:59", "endpoint_id": 10, "available": true, @@ -511,22 +463,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 5, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "5:0x0000", - "unique_id": "f4:ce:36:13:82:67:19:59:5:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:13:82:67:19:59", "endpoint_id": 5, "available": true, @@ -555,22 +491,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 5, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "5:0x0000", - "unique_id": "f4:ce:36:13:82:67:19:59:5:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:13:82:67:19:59", "endpoint_id": 5, "available": true, @@ -601,22 +521,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 5, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "5:0x0019_client", - "unique_id": "f4:ce:36:13:82:67:19:59:5:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:13:82:67:19:59", "endpoint_id": 5, "available": true, diff --git a/tests/data/devices/level-home-bolt.json b/tests/data/devices/level-home-bolt.json index 352335a28..39f0e49a4 100644 --- a/tests/data/devices/level-home-bolt.json +++ b/tests/data/devices/level-home-bolt.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "f4:ce:36:b9:50:7a:86:d6", "nwk": "0x0DFC", "manufacturer": "Level Home", @@ -210,22 +210,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 10, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "10:0x0003", - "unique_id": "f4:ce:36:b9:50:7a:86:d6:10:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:b9:50:7a:86:d6", "endpoint_id": 10, "available": true, @@ -258,22 +242,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "DoorLockClusterHandler", - "generic_id": "cluster_handler_0x0101", - "endpoint_id": 10, - "cluster": { - "id": 257, - "name": "Door Lock", - "type": "server" - }, - "id": "10:0x0101", - "unique_id": "f4:ce:36:b9:50:7a:86:d6:10:0x0101", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:b9:50:7a:86:d6", "endpoint_id": 10, "available": true, @@ -302,22 +270,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 10, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "10:0x0001", - "unique_id": "f4:ce:36:b9:50:7a:86:d6:10:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "f4:ce:36:b9:50:7a:86:d6", "endpoint_id": 10, "available": true, @@ -354,22 +306,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 5, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "5:0x0000", - "unique_id": "f4:ce:36:b9:50:7a:86:d6:5:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:b9:50:7a:86:d6", "endpoint_id": 5, "available": true, @@ -398,22 +334,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 5, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "5:0x0000", - "unique_id": "f4:ce:36:b9:50:7a:86:d6:5:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:b9:50:7a:86:d6", "endpoint_id": 5, "available": true, @@ -444,22 +364,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 5, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "5:0x0019_client", - "unique_id": "f4:ce:36:b9:50:7a:86:d6:5:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "f4:ce:36:b9:50:7a:86:d6", "endpoint_id": 5, "available": true, diff --git a/tests/data/devices/lixee-zlinky-tic.json b/tests/data/devices/lixee-zlinky-tic.json index 4e11860a2..b76eac92a 100644 --- a/tests/data/devices/lixee-zlinky-tic.json +++ b/tests/data/devices/lixee-zlinky-tic.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b9:db:c0:ae", "nwk": "0x728D", "manufacturer": "LiXee", @@ -913,22 +913,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -961,22 +945,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1005,22 +973,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1040,7 +992,7 @@ "unique_id": "ab:cd:ef:12:b9:db:c0:ae-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -1049,22 +1001,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "ZLinkyTICMetering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1073,7 +1009,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 42837.076, "device_type": "Electric Metering", @@ -1101,22 +1037,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "ZLinkyTICMetering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1153,22 +1073,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "ZLinkyTICMetering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1205,22 +1109,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "ZLinkyTICMetering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1257,22 +1145,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "ZLinkyTICMetering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1309,22 +1181,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "ZLinkyTICMetering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1361,22 +1217,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "ZLinkyTICMetering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1404,7 +1244,7 @@ "unique_id": "ab:cd:ef:12:b9:db:c0:ae-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1413,22 +1253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1437,7 +1261,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 257.0, "measurement_type": "", @@ -1463,22 +1287,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1513,22 +1321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1561,22 +1353,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1611,22 +1387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1661,22 +1421,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1711,22 +1455,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1760,22 +1488,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1809,22 +1521,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1858,22 +1554,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, @@ -1910,22 +1590,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b9:db:c0:ae:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b9:db:c0:ae", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lk-zb-doorsensor-d0003.json b/tests/data/devices/lk-zb-doorsensor-d0003.json index 1b02e31fc..ce0af3c86 100755 --- a/tests/data/devices/lk-zb-doorsensor-d0003.json +++ b/tests/data/devices/lk-zb-doorsensor-d0003.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "84:2e:14:ff:fe:44:9e:71", "nwk": "0x0128", "manufacturer": "lk", @@ -218,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "84:2e:14:ff:fe:44:9e:71:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "84:2e:14:ff:fe:44:9e:71", "endpoint_id": 1, "available": true, @@ -263,22 +247,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "84:2e:14:ff:fe:44:9e:71:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "84:2e:14:ff:fe:44:9e:71", "endpoint_id": 1, "available": true, @@ -311,22 +279,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "84:2e:14:ff:fe:44:9e:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "84:2e:14:ff:fe:44:9e:71", "endpoint_id": 1, "available": true, @@ -355,22 +307,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "84:2e:14:ff:fe:44:9e:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "84:2e:14:ff:fe:44:9e:71", "endpoint_id": 1, "available": true, @@ -399,22 +335,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "84:2e:14:ff:fe:44:9e:71:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "84:2e:14:ff:fe:44:9e:71", "endpoint_id": 1, "available": true, @@ -453,22 +373,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "84:2e:14:ff:fe:44:9e:71:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "84:2e:14:ff:fe:44:9e:71", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lk-zbt-dimswitch-d0001.json b/tests/data/devices/lk-zbt-dimswitch-d0001.json index aa436d82b..0dc8604ca 100644 --- a/tests/data/devices/lk-zbt-dimswitch-d0001.json +++ b/tests/data/devices/lk-zbt-dimswitch-d0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "5c:02:72:ff:fe:3f:8c:a4", "nwk": "0x4E9B", "manufacturer": "lk", @@ -215,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "5c:02:72:ff:fe:3f:8c:a4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:3f:8c:a4", "endpoint_id": 1, "available": true, @@ -263,22 +247,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "5c:02:72:ff:fe:3f:8c:a4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:3f:8c:a4", "endpoint_id": 1, "available": true, @@ -307,22 +275,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "5c:02:72:ff:fe:3f:8c:a4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:3f:8c:a4", "endpoint_id": 1, "available": true, @@ -351,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "5c:02:72:ff:fe:3f:8c:a4:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "5c:02:72:ff:fe:3f:8c:a4", "endpoint_id": 1, "available": true, @@ -405,22 +341,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "5c:02:72:ff:fe:3f:8c:a4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:3f:8c:a4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lk-zbt-onoffplug-d0001.json b/tests/data/devices/lk-zbt-onoffplug-d0001.json index e58be58a9..e67c691a6 100644 --- a/tests/data/devices/lk-zbt-onoffplug-d0001.json +++ b/tests/data/devices/lk-zbt-onoffplug-d0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "5c:02:72:ff:fe:d3:bc:73", "nwk": "0xE34E", "manufacturer": "lk", @@ -263,22 +263,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "5c:02:72:ff:fe:d3:bc:73:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:d3:bc:73", "endpoint_id": 1, "available": true, @@ -311,22 +295,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "5c:02:72:ff:fe:d3:bc:73:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "5c:02:72:ff:fe:d3:bc:73", "endpoint_id": 1, "available": true, @@ -358,22 +326,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "5c:02:72:ff:fe:d3:bc:73:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "5c:02:72:ff:fe:d3:bc:73", "endpoint_id": 1, "available": true, @@ -405,22 +357,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "5c:02:72:ff:fe:d3:bc:73:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "5c:02:72:ff:fe:d3:bc:73", "endpoint_id": 1, "available": true, @@ -454,22 +390,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "5c:02:72:ff:fe:d3:bc:73:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "5c:02:72:ff:fe:d3:bc:73", "endpoint_id": 1, "available": true, @@ -505,22 +425,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "5c:02:72:ff:fe:d3:bc:73:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:d3:bc:73", "endpoint_id": 1, "available": true, @@ -549,22 +453,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "5c:02:72:ff:fe:d3:bc:73:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:d3:bc:73", "endpoint_id": 1, "available": true, @@ -595,22 +483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "5c:02:72:ff:fe:d3:bc:73:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "5c:02:72:ff:fe:d3:bc:73", "endpoint_id": 1, "available": true, @@ -639,22 +511,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "5c:02:72:ff:fe:d3:bc:73:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "5c:02:72:ff:fe:d3:bc:73", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-airmonitor-acn01.json b/tests/data/devices/lumi-lumi-airmonitor-acn01.json index 9c92fa053..54465fc1a 100644 --- a/tests/data/devices/lumi-lumi-airmonitor-acn01.json +++ b/tests/data/devices/lumi-lumi-airmonitor-acn01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:10:61:a1", "nwk": "0xB413", "manufacturer": "LUMI", @@ -216,22 +216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:10:61:a1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:10:61:a1", "endpoint_id": 1, "available": true, @@ -264,22 +248,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:10:61:a1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:10:61:a1", "endpoint_id": 1, "available": true, @@ -308,22 +276,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:10:61:a1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:10:61:a1", "endpoint_id": 1, "available": true, @@ -352,22 +304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "54:ef:44:10:00:10:61:a1:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "54:ef:44:10:00:10:61:a1", "endpoint_id": 1, "available": true, @@ -404,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "54:ef:44:10:00:10:61:a1:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "54:ef:44:10:00:10:61:a1", "endpoint_id": 1, "available": true, @@ -448,22 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "54:ef:44:10:00:10:61:a1:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "54:ef:44:10:00:10:61:a1", "endpoint_id": 1, "available": true, @@ -492,22 +396,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0x042e", - "endpoint_id": 1, - "cluster": { - "id": 1070, - "name": "VOC Level", - "type": "server" - }, - "id": "1:0x042e", - "unique_id": "54:ef:44:10:00:10:61:a1:1:0x042e", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:10:61:a1", "endpoint_id": 1, "available": true, @@ -538,22 +426,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:10:61:a1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:10:61:a1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-airrtc-agl001.json b/tests/data/devices/lumi-lumi-airrtc-agl001.json index f53165000..7dcef4d2b 100644 --- a/tests/data/devices/lumi-lumi-airrtc-agl001.json +++ b/tests/data/devices/lumi-lumi-airrtc-agl001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ce:61:df:4c", "nwk": "0xF049", "manufacturer": "LUMI", @@ -394,22 +394,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraThermostatSpecificCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -437,22 +421,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraThermostatSpecificCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -480,22 +448,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraThermostatSpecificCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -523,22 +475,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraThermostatSpecificCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -568,22 +504,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -616,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -695,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraThermostatSpecificCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -744,22 +632,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraThermostatSpecificCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -794,22 +666,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -838,22 +694,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -882,22 +722,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -933,22 +757,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -977,22 +785,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -1021,22 +813,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ThermostatCluster", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -1067,22 +843,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraThermostatSpecificCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -1115,22 +875,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraThermostatSpecificCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -1163,22 +907,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraThermostatSpecificCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, @@ -1213,22 +941,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ce:61:df:4c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:61:df:4c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-ctrl-neutral2.json b/tests/data/devices/lumi-lumi-ctrl-neutral2.json index c84363289..0aa494542 100644 --- a/tests/data/devices/lumi-lumi-ctrl-neutral2.json +++ b/tests/data/devices/lumi-lumi-ctrl-neutral2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:35:1a:bf:9e", "nwk": "0x1FEC", "manufacturer": "LUMI", @@ -340,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:35:1a:bf:9e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:1a:bf:9e", "endpoint_id": 1, "available": true, @@ -388,22 +372,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:35:1a:bf:9e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:1a:bf:9e", "endpoint_id": 1, "available": true, @@ -432,22 +400,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:35:1a:bf:9e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:1a:bf:9e", "endpoint_id": 1, "available": true, @@ -476,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:35:1a:bf:9e:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:35:1a:bf:9e", "endpoint_id": 1, "available": true, @@ -522,22 +458,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:35:1a:bf:9e:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:35:1a:bf:9e", "endpoint_id": 2, "available": true, @@ -564,22 +484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:35:1a:bf:9e:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:35:1a:bf:9e", "endpoint_id": 3, "available": true, @@ -606,22 +510,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:35:1a:bf:9e:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:35:1a:bf:9e", "endpoint_id": 4, "available": true, @@ -648,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 5, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "5:0x0006", - "unique_id": "ab:cd:ef:12:35:1a:bf:9e:5:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:35:1a:bf:9e", "endpoint_id": 5, "available": true, @@ -692,22 +564,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:35:1a:bf:9e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:1a:bf:9e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-curtain-acn002.json b/tests/data/devices/lumi-lumi-curtain-acn002.json index 87647b5a9..5d6daf6af 100644 --- a/tests/data/devices/lumi-lumi-curtain-acn002.json +++ b/tests/data/devices/lumi-lumi-curtain-acn002.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:dc:6a:11:ac", "nwk": "0x7F3C", "manufacturer": "LUMI", @@ -402,22 +402,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "XiaomiAqaraRollerE1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, @@ -445,22 +429,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "XiaomiAqaraRollerE1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, @@ -490,22 +458,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, @@ -538,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, @@ -588,22 +524,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "XiaomiAqaraRollerE1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, @@ -638,22 +558,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, @@ -682,22 +586,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, @@ -726,22 +614,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, @@ -777,22 +649,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, @@ -821,22 +677,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, @@ -867,22 +707,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, @@ -917,22 +741,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:dc:6a:11:ac:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:6a:11:ac", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-curtain-acn003.json b/tests/data/devices/lumi-lumi-curtain-acn003.json index 5507cff36..83a9fba42 100644 --- a/tests/data/devices/lumi-lumi-curtain-acn003.json +++ b/tests/data/devices/lumi-lumi-curtain-acn003.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:26:4b:7b:ee", "nwk": "0x2F28", "manufacturer": "LUMI", @@ -203,22 +203,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:26:4b:7b:ee:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:26:4b:7b:ee", "endpoint_id": 1, "available": true, @@ -251,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:26:4b:7b:ee:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:26:4b:7b:ee", "endpoint_id": 1, "available": true, @@ -301,22 +269,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:26:4b:7b:ee:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:26:4b:7b:ee", "endpoint_id": 1, "available": true, @@ -345,22 +297,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:26:4b:7b:ee:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:26:4b:7b:ee", "endpoint_id": 1, "available": true, @@ -389,22 +325,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:26:4b:7b:ee:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:26:4b:7b:ee", "endpoint_id": 1, "available": true, @@ -440,22 +360,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:26:4b:7b:ee:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:26:4b:7b:ee", "endpoint_id": 1, "available": true, @@ -484,22 +388,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:26:4b:7b:ee:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:26:4b:7b:ee", "endpoint_id": 1, "available": true, @@ -530,22 +418,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:26:4b:7b:ee:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:26:4b:7b:ee", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-curtain-agl001.json b/tests/data/devices/lumi-lumi-curtain-agl001.json index 5ad44d7bf..c101bb9fc 100644 --- a/tests/data/devices/lumi-lumi-curtain-agl001.json +++ b/tests/data/devices/lumi-lumi-curtain-agl001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:4f:fb:a7", "nwk": "0x5A53", "manufacturer": "LUMI", @@ -326,22 +326,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "XiaomiAqaraDriverE1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -371,22 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -419,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -469,22 +421,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -513,22 +449,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -557,22 +477,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -601,22 +505,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -653,22 +541,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -697,22 +569,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -741,22 +597,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "XiaomiAqaraDriverE1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -787,22 +627,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -835,22 +659,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "XiaomiAqaraDriverE1", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, @@ -885,22 +693,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:4f:fb:a7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:4f:fb:a7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-curtain-hagl04.json b/tests/data/devices/lumi-lumi-curtain-hagl04.json index 5768fafd6..9bb233268 100644 --- a/tests/data/devices/lumi-lumi-curtain-hagl04.json +++ b/tests/data/devices/lumi-lumi-curtain-hagl04.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:43:8b:55:72", "nwk": "0x3345", "manufacturer": "LUMI", @@ -277,22 +277,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:43:8b:55:72:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:8b:55:72", "endpoint_id": 1, "available": true, @@ -325,22 +309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:43:8b:55:72:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:43:8b:55:72", "endpoint_id": 1, "available": true, @@ -375,22 +343,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 1, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "1:0x000d", - "unique_id": "ab:cd:ef:12:43:8b:55:72:1:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:43:8b:55:72", "endpoint_id": 1, "available": true, @@ -424,22 +376,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:43:8b:55:72:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:8b:55:72", "endpoint_id": 1, "available": true, @@ -468,22 +404,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:43:8b:55:72:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:8b:55:72", "endpoint_id": 1, "available": true, @@ -512,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:43:8b:55:72:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:43:8b:55:72", "endpoint_id": 1, "available": true, @@ -558,22 +462,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:43:8b:55:72:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:43:8b:55:72", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-flood-acn001.json b/tests/data/devices/lumi-lumi-flood-acn001.json index 12da8faf4..5f27a2bc5 100644 --- a/tests/data/devices/lumi-lumi-flood-acn001.json +++ b/tests/data/devices/lumi-lumi-flood-acn001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:22:14:df", "nwk": "0x7779", "manufacturer": "LUMI", @@ -219,22 +219,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "54:ef:44:10:00:22:14:df:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:22:14:df", "endpoint_id": 1, "available": true, @@ -264,22 +248,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:22:14:df:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:22:14:df", "endpoint_id": 1, "available": true, @@ -312,22 +280,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:22:14:df:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:22:14:df", "endpoint_id": 1, "available": true, @@ -356,22 +308,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:22:14:df:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:22:14:df", "endpoint_id": 1, "available": true, @@ -400,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "54:ef:44:10:00:22:14:df:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "54:ef:44:10:00:22:14:df", "endpoint_id": 1, "available": true, @@ -454,22 +374,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:22:14:df:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:22:14:df", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-flood-agl02.json b/tests/data/devices/lumi-lumi-flood-agl02.json index fe913190b..581fbda9d 100644 --- a/tests/data/devices/lumi-lumi-flood-agl02.json +++ b/tests/data/devices/lumi-lumi-flood-agl02.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:aa:c8:25", "nwk": "0x6A94", "manufacturer": "LUMI", @@ -206,22 +206,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "54:ef:44:10:00:aa:c8:25:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:aa:c8:25", "endpoint_id": 1, "available": true, @@ -251,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:aa:c8:25:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:aa:c8:25", "endpoint_id": 1, "available": true, @@ -299,22 +267,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:aa:c8:25:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:aa:c8:25", "endpoint_id": 1, "available": true, @@ -343,22 +295,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:aa:c8:25:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:aa:c8:25", "endpoint_id": 1, "available": true, @@ -387,22 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "54:ef:44:10:00:aa:c8:25:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "54:ef:44:10:00:aa:c8:25", "endpoint_id": 1, "available": true, @@ -441,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:aa:c8:25:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:aa:c8:25", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-light-aqcn02.json b/tests/data/devices/lumi-lumi-light-aqcn02.json index c476ae58e..15cebc3e3 100644 --- a/tests/data/devices/lumi-lumi-light-aqcn02.json +++ b/tests/data/devices/lumi-lumi-light-aqcn02.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d2:16:bb:90", "nwk": "0x6340", "manufacturer": "LUMI", @@ -344,22 +344,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d2:16:bb:90:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:16:bb:90", "endpoint_id": 1, "available": true, @@ -392,50 +376,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d2:16:bb:90:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:d2:16:bb:90:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:d2:16:bb:90:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:d2:16:bb:90", "endpoint_id": 1, "available": true, @@ -490,22 +430,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:d2:16:bb:90:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:d2:16:bb:90", "endpoint_id": 1, "available": true, @@ -539,22 +463,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:16:bb:90:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:16:bb:90", "endpoint_id": 1, "available": true, @@ -583,22 +491,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:16:bb:90:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:16:bb:90", "endpoint_id": 1, "available": true, @@ -629,22 +521,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d2:16:bb:90:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:16:bb:90", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-magnet-ac01.json b/tests/data/devices/lumi-lumi-magnet-ac01.json index 039b80209..313732fce 100644 --- a/tests/data/devices/lumi-lumi-magnet-ac01.json +++ b/tests/data/devices/lumi-lumi-magnet-ac01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:1e:85:7f", "nwk": "0xFC15", "manufacturer": "LUMI", @@ -178,22 +178,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "54:ef:44:10:00:1e:85:7f:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:1e:85:7f", "endpoint_id": 1, "available": true, @@ -223,22 +207,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:1e:85:7f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:1e:85:7f", "endpoint_id": 1, "available": true, @@ -271,22 +239,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:1e:85:7f:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:1e:85:7f", "endpoint_id": 1, "available": true, @@ -321,22 +273,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:1e:85:7f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:1e:85:7f", "endpoint_id": 1, "available": true, @@ -365,22 +301,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:1e:85:7f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:1e:85:7f", "endpoint_id": 1, "available": true, @@ -409,22 +329,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "54:ef:44:10:00:1e:85:7f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "54:ef:44:10:00:1e:85:7f", "endpoint_id": 1, "available": true, @@ -463,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:1e:85:7f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:1e:85:7f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-magnet-acn001.json b/tests/data/devices/lumi-lumi-magnet-acn001.json index ecd984c9c..fc4385b8f 100644 --- a/tests/data/devices/lumi-lumi-magnet-acn001.json +++ b/tests/data/devices/lumi-lumi-magnet-acn001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:25:87:7e", "nwk": "0x2B49", "manufacturer": "LUMI", @@ -219,22 +219,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "54:ef:44:10:00:25:87:7e:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:25:87:7e", "endpoint_id": 1, "available": true, @@ -264,22 +248,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:25:87:7e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:25:87:7e", "endpoint_id": 1, "available": true, @@ -312,22 +280,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:25:87:7e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:25:87:7e", "endpoint_id": 1, "available": true, @@ -356,22 +308,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:25:87:7e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:25:87:7e", "endpoint_id": 1, "available": true, @@ -400,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "54:ef:44:10:00:25:87:7e:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "54:ef:44:10:00:25:87:7e", "endpoint_id": 1, "available": true, @@ -454,22 +374,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:25:87:7e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:25:87:7e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-magnet-agl02.json b/tests/data/devices/lumi-lumi-magnet-agl02.json index b1cf8b9f3..bd6819747 100644 --- a/tests/data/devices/lumi-lumi-magnet-agl02.json +++ b/tests/data/devices/lumi-lumi-magnet-agl02.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:52:70:f0:26", "nwk": "0x6E4A", "manufacturer": "LUMI", @@ -159,22 +159,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:52:70:f0:26:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:70:f0:26", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:52:70:f0:26:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:70:f0:26", "endpoint_id": 1, "available": true, @@ -252,22 +220,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:52:70:f0:26:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:70:f0:26", "endpoint_id": 1, "available": true, @@ -296,22 +248,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:52:70:f0:26:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:70:f0:26", "endpoint_id": 1, "available": true, @@ -340,22 +276,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:52:70:f0:26:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:52:70:f0:26", "endpoint_id": 1, "available": true, @@ -393,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:52:70:f0:26:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:70:f0:26", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-motion-ac02.json b/tests/data/devices/lumi-lumi-motion-ac02.json index 31799d8b4..99880a576 100755 --- a/tests/data/devices/lumi-lumi-motion-ac02.json +++ b/tests/data/devices/lumi-lumi-motion-ac02.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:49:74:c7", "nwk": "0x69C1", "manufacturer": "LUMI", @@ -245,22 +245,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "54:ef:44:10:00:49:74:c7:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "54:ef:44:10:00:49:74:c7", "endpoint_id": 1, "available": true, @@ -288,22 +272,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "54:ef:44:10:00:49:74:c7:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:49:74:c7", "endpoint_id": 1, "available": true, @@ -333,22 +301,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:49:74:c7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:49:74:c7", "endpoint_id": 1, "available": true, @@ -381,22 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:49:74:c7:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:49:74:c7", "endpoint_id": 1, "available": true, @@ -430,22 +366,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:49:74:c7:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:49:74:c7", "endpoint_id": 1, "available": true, @@ -480,22 +400,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:49:74:c7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:49:74:c7", "endpoint_id": 1, "available": true, @@ -524,22 +428,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:49:74:c7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:49:74:c7", "endpoint_id": 1, "available": true, @@ -568,22 +456,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "54:ef:44:10:00:49:74:c7:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "54:ef:44:10:00:49:74:c7", "endpoint_id": 1, "available": true, @@ -620,22 +492,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "54:ef:44:10:00:49:74:c7:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "54:ef:44:10:00:49:74:c7", "endpoint_id": 1, "available": true, @@ -666,22 +522,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:49:74:c7:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:49:74:c7", "endpoint_id": 1, "available": true, @@ -716,22 +556,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:49:74:c7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:49:74:c7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-motion-agl02.json b/tests/data/devices/lumi-lumi-motion-agl02.json index 12818d7ea..718e56cd5 100644 --- a/tests/data/devices/lumi-lumi-motion-agl02.json +++ b/tests/data/devices/lumi-lumi-motion-agl02.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:19:e0:9d", "nwk": "0xFB00", "manufacturer": "LUMI", @@ -226,22 +226,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "54:ef:44:10:00:19:e0:9d:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "54:ef:44:10:00:19:e0:9d", "endpoint_id": 1, "available": true, @@ -269,22 +253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "54:ef:44:10:00:19:e0:9d:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:19:e0:9d", "endpoint_id": 1, "available": true, @@ -314,22 +282,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:19:e0:9d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:19:e0:9d", "endpoint_id": 1, "available": true, @@ -362,22 +314,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:19:e0:9d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:19:e0:9d", "endpoint_id": 1, "available": true, @@ -406,22 +342,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:19:e0:9d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:19:e0:9d", "endpoint_id": 1, "available": true, @@ -450,22 +370,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "54:ef:44:10:00:19:e0:9d:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "54:ef:44:10:00:19:e0:9d", "endpoint_id": 1, "available": true, @@ -502,22 +406,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "54:ef:44:10:00:19:e0:9d:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "54:ef:44:10:00:19:e0:9d", "endpoint_id": 1, "available": true, @@ -548,22 +436,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:19:e0:9d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:19:e0:9d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-motion-agl04.json b/tests/data/devices/lumi-lumi-motion-agl04.json index 85ce82c53..1e9be9df1 100644 --- a/tests/data/devices/lumi-lumi-motion-agl04.json +++ b/tests/data/devices/lumi-lumi-motion-agl04.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:40:a2:bb", "nwk": "0x82FC", "manufacturer": "LUMI", @@ -228,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "54:ef:44:10:00:40:a2:bb:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "54:ef:44:10:00:40:a2:bb", "endpoint_id": 1, "available": true, @@ -271,22 +255,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "54:ef:44:10:00:40:a2:bb:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:40:a2:bb", "endpoint_id": 1, "available": true, @@ -316,22 +284,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:40:a2:bb:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:40:a2:bb", "endpoint_id": 1, "available": true, @@ -364,22 +316,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:40:a2:bb:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:40:a2:bb", "endpoint_id": 1, "available": true, @@ -413,22 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:40:a2:bb:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:40:a2:bb", "endpoint_id": 1, "available": true, @@ -463,22 +383,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:40:a2:bb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:40:a2:bb", "endpoint_id": 1, "available": true, @@ -507,22 +411,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:40:a2:bb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:40:a2:bb", "endpoint_id": 1, "available": true, @@ -551,22 +439,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "54:ef:44:10:00:40:a2:bb:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "54:ef:44:10:00:40:a2:bb", "endpoint_id": 1, "available": true, @@ -603,22 +475,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "54:ef:44:10:00:40:a2:bb:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "54:ef:44:10:00:40:a2:bb", "endpoint_id": 1, "available": true, @@ -649,22 +505,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:40:a2:bb:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:40:a2:bb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-plug-maeu01.json b/tests/data/devices/lumi-lumi-plug-maeu01.json index 306934379..2ddca4d8d 100644 --- a/tests/data/devices/lumi-lumi-plug-maeu01.json +++ b/tests/data/devices/lumi-lumi-plug-maeu01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:49:c1:10:71", "nwk": "0xE95B", "manufacturer": "LUMI", @@ -400,22 +400,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, @@ -448,22 +432,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, @@ -492,22 +460,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, @@ -536,22 +488,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, @@ -587,22 +523,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, @@ -638,22 +558,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, @@ -673,7 +577,7 @@ "unique_id": "ab:cd:ef:12:49:c1:10:71-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -682,22 +586,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, @@ -706,7 +594,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -730,22 +618,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, @@ -777,22 +649,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, @@ -825,22 +681,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, @@ -875,22 +715,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, @@ -919,22 +743,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:49:c1:10:71:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:49:c1:10:71", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-plug-maus01.json b/tests/data/devices/lumi-lumi-plug-maus01.json index d1e594506..6c7cfac73 100644 --- a/tests/data/devices/lumi-lumi-plug-maus01.json +++ b/tests/data/devices/lumi-lumi-plug-maus01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:02:82:d0:78", "nwk": "0x9FB9", "manufacturer": "LUMI", @@ -505,22 +505,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 100, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "100:0x000f", - "unique_id": "00:15:8d:00:02:82:d0:78:100:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 100, "available": true, @@ -550,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -598,22 +566,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -642,22 +594,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -686,22 +622,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "MeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -737,22 +657,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "MeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -788,22 +692,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -823,7 +711,7 @@ "unique_id": "00:15:8d:00:02:82:d0:78-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -832,22 +720,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -856,7 +728,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.9 }, @@ -880,22 +752,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -928,22 +784,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -975,22 +815,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -1023,22 +847,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -1071,22 +879,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -1121,22 +913,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, @@ -1165,22 +941,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:15:8d:00:02:82:d0:78:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:82:d0:78", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-relay-c2acn01.json b/tests/data/devices/lumi-lumi-relay-c2acn01.json index 4bf745322..9ee666ac4 100644 --- a/tests/data/devices/lumi-lumi-relay-c2acn01.json +++ b/tests/data/devices/lumi-lumi-relay-c2acn01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:04:44:ec:08", "nwk": "0x8F9D", "manufacturer": "LUMI", @@ -417,22 +417,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, @@ -465,22 +449,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, @@ -531,22 +499,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "00:15:8d:00:04:44:ec:08:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 2, "available": true, @@ -599,22 +551,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, @@ -643,22 +579,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, @@ -687,22 +607,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "MeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, @@ -738,22 +642,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "MeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, @@ -789,22 +677,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, @@ -824,7 +696,7 @@ "unique_id": "00:15:8d:00:04:44:ec:08-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -833,22 +705,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, @@ -857,7 +713,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -881,22 +737,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, @@ -928,22 +768,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, @@ -976,22 +800,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, @@ -1026,22 +834,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:15:8d:00:04:44:ec:08:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:04:44:ec:08", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-remote-b286opcn01.json b/tests/data/devices/lumi-lumi-remote-b286opcn01.json index 45d591ac5..6949d8da3 100644 --- a/tests/data/devices/lumi-lumi-remote-b286opcn01.json +++ b/tests/data/devices/lumi-lumi-remote-b286opcn01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "04:cf:8c:df:3c:75:c1:67", "nwk": "0x634D", "manufacturer": "LUMI", @@ -405,22 +405,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "04:cf:8c:df:3c:75:c1:67:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:75:c1:67", "endpoint_id": 1, "available": true, @@ -453,22 +437,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:75:c1:67:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:75:c1:67", "endpoint_id": 1, "available": true, @@ -497,22 +465,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:75:c1:67:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:75:c1:67", "endpoint_id": 1, "available": true, @@ -541,22 +493,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "04:cf:8c:df:3c:75:c1:67:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "04:cf:8c:df:3c:75:c1:67", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-remote-b28ac1.json b/tests/data/devices/lumi-lumi-remote-b28ac1.json index b7bc6edbe..657a185c3 100644 --- a/tests/data/devices/lumi-lumi-remote-b28ac1.json +++ b/tests/data/devices/lumi-lumi-remote-b28ac1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b2:f6:6e:7d", "nwk": "0x9CFA", "manufacturer": "LUMI", @@ -252,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:b2:f6:6e:7d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b2:f6:6e:7d", "endpoint_id": 1, "available": true, @@ -300,22 +284,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraRemoteManuSpecificCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:b2:f6:6e:7d:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b2:f6:6e:7d", "endpoint_id": 1, "available": true, @@ -347,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "AqaraRemoteManuSpecificCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "ab:cd:ef:12:b2:f6:6e:7d:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b2:f6:6e:7d", "endpoint_id": 1, "available": true, @@ -396,22 +348,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b2:f6:6e:7d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b2:f6:6e:7d", "endpoint_id": 1, "available": true, @@ -440,22 +376,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b2:f6:6e:7d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b2:f6:6e:7d", "endpoint_id": 1, "available": true, @@ -484,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:b2:f6:6e:7d:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:b2:f6:6e:7d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-remote-b486opcn01.json b/tests/data/devices/lumi-lumi-remote-b486opcn01.json index 5dda0f411..3fb521fba 100755 --- a/tests/data/devices/lumi-lumi-remote-b486opcn01.json +++ b/tests/data/devices/lumi-lumi-remote-b486opcn01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "04:cf:8c:df:3c:75:c1:7b", "nwk": "0x78F2", "manufacturer": "LUMI", @@ -271,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "04:cf:8c:df:3c:75:c1:7b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:75:c1:7b", "endpoint_id": 1, "available": true, @@ -319,22 +303,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:75:c1:7b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:75:c1:7b", "endpoint_id": 1, "available": true, @@ -363,22 +331,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:75:c1:7b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:75:c1:7b", "endpoint_id": 1, "available": true, @@ -407,22 +359,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "04:cf:8c:df:3c:75:c1:7b:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "04:cf:8c:df:3c:75:c1:7b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-remote-b686opcn01.json b/tests/data/devices/lumi-lumi-remote-b686opcn01.json index 04fdd0926..2ec715c0d 100644 --- a/tests/data/devices/lumi-lumi-remote-b686opcn01.json +++ b/tests/data/devices/lumi-lumi-remote-b686opcn01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "04:cf:8c:df:3c:79:47:76", "nwk": "0x1B26", "manufacturer": "LUMI", @@ -379,22 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "04:cf:8c:df:3c:79:47:76:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:79:47:76", "endpoint_id": 1, "available": true, @@ -427,22 +411,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:79:47:76:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:79:47:76", "endpoint_id": 1, "available": true, @@ -471,22 +439,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:79:47:76:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:79:47:76", "endpoint_id": 1, "available": true, @@ -515,22 +467,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "04:cf:8c:df:3c:79:47:76:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "04:cf:8c:df:3c:79:47:76", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-remote-cagl02.json b/tests/data/devices/lumi-lumi-remote-cagl02.json index f73ec1550..8ea6f90f2 100644 --- a/tests/data/devices/lumi-lumi-remote-cagl02.json +++ b/tests/data/devices/lumi-lumi-remote-cagl02.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:14:f3:e7", "nwk": "0x67CE", "manufacturer": "LUMI", @@ -260,22 +260,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:14:f3:e7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:14:f3:e7", "endpoint_id": 1, "available": true, @@ -308,22 +292,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:14:f3:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:14:f3:e7", "endpoint_id": 1, "available": true, @@ -352,22 +320,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:14:f3:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:14:f3:e7", "endpoint_id": 1, "available": true, @@ -396,22 +348,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "54:ef:44:10:00:14:f3:e7:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "54:ef:44:10:00:14:f3:e7", "endpoint_id": 1, "available": true, @@ -450,22 +386,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:14:f3:e7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:14:f3:e7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-sen-ill-agl01.json b/tests/data/devices/lumi-lumi-sen-ill-agl01.json index 05b19ca01..97acd3a79 100644 --- a/tests/data/devices/lumi-lumi-sen-ill-agl01.json +++ b/tests/data/devices/lumi-lumi-sen-ill-agl01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:0d:d9:db:dd", "nwk": "0x136D", "manufacturer": "LUMI", @@ -178,22 +178,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:0d:d9:db:dd:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0d:d9:db:dd", "endpoint_id": 1, "available": true, @@ -226,22 +210,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0d:d9:db:dd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0d:d9:db:dd", "endpoint_id": 1, "available": true, @@ -270,22 +238,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0d:d9:db:dd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0d:d9:db:dd", "endpoint_id": 1, "available": true, @@ -314,22 +266,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:0d:d9:db:dd:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:0d:d9:db:dd", "endpoint_id": 1, "available": true, @@ -366,22 +302,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:0d:d9:db:dd:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:0d:d9:db:dd", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-sen-ill-mgl01.json b/tests/data/devices/lumi-lumi-sen-ill-mgl01.json index 574eba33c..09253b590 100644 --- a/tests/data/devices/lumi-lumi-sen-ill-mgl01.json +++ b/tests/data/devices/lumi-lumi-sen-ill-mgl01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "04:cf:8c:df:3c:77:19:75", "nwk": "0x13F8", "manufacturer": "LUMI", @@ -167,22 +167,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "04:cf:8c:df:3c:77:19:75:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:77:19:75", "endpoint_id": 1, "available": true, @@ -215,22 +199,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:77:19:75:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:77:19:75", "endpoint_id": 1, "available": true, @@ -259,22 +227,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:77:19:75:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:77:19:75", "endpoint_id": 1, "available": true, @@ -303,22 +255,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "04:cf:8c:df:3c:77:19:75:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "04:cf:8c:df:3c:77:19:75", "endpoint_id": 1, "available": true, @@ -355,22 +291,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "04:cf:8c:df:3c:77:19:75:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "04:cf:8c:df:3c:77:19:75", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-sensor-86sw2.json b/tests/data/devices/lumi-lumi-sensor-86sw2.json index 77d9a7d7d..84e91e4b1 100644 --- a/tests/data/devices/lumi-lumi-sensor-86sw2.json +++ b/tests/data/devices/lumi-lumi-sensor-86sw2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:02:54:cb:fa", "nwk": "0x8BA2", "manufacturer": "LUMI", @@ -355,22 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:02:54:cb:fa:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:54:cb:fa", "endpoint_id": 1, "available": true, @@ -403,22 +387,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:54:cb:fa:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:54:cb:fa", "endpoint_id": 1, "available": true, @@ -447,22 +415,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:54:cb:fa:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:54:cb:fa", "endpoint_id": 1, "available": true, @@ -491,22 +443,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:15:8d:00:02:54:cb:fa:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:8d:00:02:54:cb:fa", "endpoint_id": 1, "available": true, @@ -543,22 +479,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "00:15:8d:00:02:54:cb:fa:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "00:15:8d:00:02:54:cb:fa", "endpoint_id": 1, "available": true, @@ -589,22 +509,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:15:8d:00:02:54:cb:fa:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:54:cb:fa", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-sensor-ht-agl02.json b/tests/data/devices/lumi-lumi-sensor-ht-agl02.json index 658a152bf..27f2913f1 100644 --- a/tests/data/devices/lumi-lumi-sensor-ht-agl02.json +++ b/tests/data/devices/lumi-lumi-sensor-ht-agl02.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "04:cf:8c:df:3c:7f:c5:a7", "nwk": "0xF920", "manufacturer": "LUMI", @@ -210,22 +210,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "04:cf:8c:df:3c:7f:c5:a7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:7f:c5:a7", "endpoint_id": 1, "available": true, @@ -258,22 +242,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:7f:c5:a7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:7f:c5:a7", "endpoint_id": 1, "available": true, @@ -302,22 +270,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:7f:c5:a7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:7f:c5:a7", "endpoint_id": 1, "available": true, @@ -346,22 +298,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "04:cf:8c:df:3c:7f:c5:a7:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "04:cf:8c:df:3c:7f:c5:a7", "endpoint_id": 1, "available": true, @@ -398,22 +334,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "04:cf:8c:df:3c:7f:c5:a7:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "04:cf:8c:df:3c:7f:c5:a7", "endpoint_id": 1, "available": true, @@ -442,22 +362,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PressureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0403", - "endpoint_id": 1, - "cluster": { - "id": 1027, - "name": "Pressure Measurement", - "type": "server" - }, - "id": "1:0x0403", - "unique_id": "04:cf:8c:df:3c:7f:c5:a7:1:0x0403", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "04:cf:8c:df:3c:7f:c5:a7", "endpoint_id": 1, "available": true, @@ -486,22 +390,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "04:cf:8c:df:3c:7f:c5:a7:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "04:cf:8c:df:3c:7f:c5:a7", "endpoint_id": 1, "available": true, @@ -532,22 +420,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "04:cf:8c:df:3c:7f:c5:a7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:7f:c5:a7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-sensor-magnet-aq2.json b/tests/data/devices/lumi-lumi-sensor-magnet-aq2.json index 6ab2f7a85..f6648d463 100644 --- a/tests/data/devices/lumi-lumi-sensor-magnet-aq2.json +++ b/tests/data/devices/lumi-lumi-sensor-magnet-aq2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:01:ab:40:52", "nwk": "0x2C1E", "manufacturer": "LUMI", @@ -196,22 +196,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "00:15:8d:00:01:ab:40:52:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:01:ab:40:52", "endpoint_id": 1, "available": true, @@ -241,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:01:ab:40:52:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:01:ab:40:52", "endpoint_id": 1, "available": true, @@ -289,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:01:ab:40:52:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:01:ab:40:52", "endpoint_id": 1, "available": true, @@ -333,22 +285,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:01:ab:40:52:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:01:ab:40:52", "endpoint_id": 1, "available": true, @@ -377,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:15:8d:00:01:ab:40:52:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:8d:00:01:ab:40:52", "endpoint_id": 1, "available": true, @@ -429,22 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "00:15:8d:00:01:ab:40:52:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "00:15:8d:00:01:ab:40:52", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-sensor-motion-aq2.json b/tests/data/devices/lumi-lumi-sensor-motion-aq2.json index cdbb90cab..5dd4ab9a3 100644 --- a/tests/data/devices/lumi-lumi-sensor-motion-aq2.json +++ b/tests/data/devices/lumi-lumi-sensor-motion-aq2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:01:b1:ca:eb", "nwk": "0xAC79", "manufacturer": "LUMI", @@ -235,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "00:15:8d:00:01:b1:ca:eb:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "00:15:8d:00:01:b1:ca:eb", "endpoint_id": 1, "available": true, @@ -278,22 +262,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "00:15:8d:00:01:b1:ca:eb:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:01:b1:ca:eb", "endpoint_id": 1, "available": true, @@ -323,22 +291,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:01:b1:ca:eb:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:01:b1:ca:eb", "endpoint_id": 1, "available": true, @@ -371,22 +323,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:01:b1:ca:eb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:01:b1:ca:eb", "endpoint_id": 1, "available": true, @@ -415,22 +351,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:01:b1:ca:eb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:01:b1:ca:eb", "endpoint_id": 1, "available": true, @@ -459,22 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:15:8d:00:01:b1:ca:eb:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:8d:00:01:b1:ca:eb", "endpoint_id": 1, "available": true, @@ -511,22 +415,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "00:15:8d:00:01:b1:ca:eb:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:8d:00:01:b1:ca:eb", "endpoint_id": 1, "available": true, @@ -555,22 +443,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "00:15:8d:00:01:b1:ca:eb:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "00:15:8d:00:01:b1:ca:eb", "endpoint_id": 1, "available": true, @@ -601,22 +473,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:15:8d:00:01:b1:ca:eb:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:01:b1:ca:eb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-sensor-smoke-acn03.json b/tests/data/devices/lumi-lumi-sensor-smoke-acn03.json index f1f027784..c0f954f40 100644 --- a/tests/data/devices/lumi-lumi-sensor-smoke-acn03.json +++ b/tests/data/devices/lumi-lumi-sensor-smoke-acn03.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "54:ef:44:10:00:5a:6e:93", "nwk": "0xBBED", "manufacturer": "LUMI", @@ -228,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -271,22 +255,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -316,22 +284,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -362,22 +314,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -407,22 +343,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -451,22 +371,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -495,22 +399,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -547,22 +435,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -593,22 +465,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -641,22 +497,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -689,22 +529,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -737,22 +561,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OppleRemoteClusterHandler", - "generic_id": "cluster_handler_0xfcc0", - "endpoint_id": 1, - "cluster": { - "id": 64704, - "name": "OppleCluster", - "type": "server" - }, - "id": "1:0xfcc0", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0xfcc0", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, @@ -787,22 +595,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "54:ef:44:10:00:5a:6e:93:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "54:ef:44:10:00:5a:6e:93", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-sensor-smoke.json b/tests/data/devices/lumi-lumi-sensor-smoke.json index 777963eea..f147d73fc 100644 --- a/tests/data/devices/lumi-lumi-sensor-smoke.json +++ b/tests/data/devices/lumi-lumi-sensor-smoke.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:02:cb:2e:a9", "nwk": "0x4609", "manufacturer": "LUMI", @@ -271,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "00:15:8d:00:02:cb:2e:a9:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:cb:2e:a9", "endpoint_id": 1, "available": true, @@ -316,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:02:cb:2e:a9:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:cb:2e:a9", "endpoint_id": 1, "available": true, @@ -364,22 +332,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:cb:2e:a9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:cb:2e:a9", "endpoint_id": 1, "available": true, @@ -408,22 +360,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:cb:2e:a9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:cb:2e:a9", "endpoint_id": 1, "available": true, @@ -452,22 +388,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:15:8d:00:02:cb:2e:a9:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:8d:00:02:cb:2e:a9", "endpoint_id": 1, "available": true, @@ -504,22 +424,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "00:15:8d:00:02:cb:2e:a9:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "00:15:8d:00:02:cb:2e:a9", "endpoint_id": 1, "available": true, @@ -550,22 +454,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:15:8d:00:02:cb:2e:a9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:cb:2e:a9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-sensor-switch-aq2.json b/tests/data/devices/lumi-lumi-sensor-switch-aq2.json index 25ff0b7b8..77523b418 100644 --- a/tests/data/devices/lumi-lumi-sensor-switch-aq2.json +++ b/tests/data/devices/lumi-lumi-sensor-switch-aq2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:02:13:91:38", "nwk": "0xE14A", "manufacturer": "LUMI", @@ -196,22 +196,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:13:91:38:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:13:91:38", "endpoint_id": 1, "available": true, @@ -240,22 +224,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:13:91:38:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:13:91:38", "endpoint_id": 1, "available": true, @@ -284,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:15:8d:00:02:13:91:38:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:8d:00:02:13:91:38", "endpoint_id": 1, "available": true, @@ -336,22 +288,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "00:15:8d:00:02:13:91:38:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "00:15:8d:00:02:13:91:38", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-sensor-switch-aq3.json b/tests/data/devices/lumi-lumi-sensor-switch-aq3.json index e6efcc810..72cd9a29e 100644 --- a/tests/data/devices/lumi-lumi-sensor-switch-aq3.json +++ b/tests/data/devices/lumi-lumi-sensor-switch-aq3.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:02:b0:e5:91", "nwk": "0x3E30", "manufacturer": "LUMI", @@ -179,22 +179,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:b0:e5:91:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:b0:e5:91", "endpoint_id": 1, "available": true, @@ -223,22 +207,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:b0:e5:91:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:b0:e5:91", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:15:8d:00:02:b0:e5:91:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:8d:00:02:b0:e5:91", "endpoint_id": 1, "available": true, @@ -319,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "00:15:8d:00:02:b0:e5:91:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "00:15:8d:00:02:b0:e5:91", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-sensor-switch.json b/tests/data/devices/lumi-lumi-sensor-switch.json index 430432985..3a389939b 100644 --- a/tests/data/devices/lumi-lumi-sensor-switch.json +++ b/tests/data/devices/lumi-lumi-sensor-switch.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:02:10:ba:72", "nwk": "0x2A32", "manufacturer": "LUMI", @@ -186,22 +186,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:02:10:ba:72:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:10:ba:72", "endpoint_id": 1, "available": true, @@ -234,22 +218,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:10:ba:72:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:10:ba:72", "endpoint_id": 1, "available": true, @@ -278,22 +246,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:10:ba:72:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:10:ba:72", "endpoint_id": 1, "available": true, @@ -322,22 +274,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:15:8d:00:02:10:ba:72:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:8d:00:02:10:ba:72", "endpoint_id": 1, "available": true, @@ -376,22 +312,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:15:8d:00:02:10:ba:72:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:10:ba:72", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-switch-b1lacn02.json b/tests/data/devices/lumi-lumi-switch-b1lacn02.json index 730d36f53..e3146dec6 100644 --- a/tests/data/devices/lumi-lumi-switch-b1lacn02.json +++ b/tests/data/devices/lumi-lumi-switch-b1lacn02.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:63:c6:80:fe", "nwk": "0x9A30", "manufacturer": "LUMI", @@ -311,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:63:c6:80:fe:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:63:c6:80:fe", "endpoint_id": 1, "available": true, @@ -359,22 +343,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:63:c6:80:fe:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:63:c6:80:fe", "endpoint_id": 1, "available": true, @@ -403,22 +371,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:63:c6:80:fe:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:63:c6:80:fe", "endpoint_id": 1, "available": true, @@ -447,22 +399,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:63:c6:80:fe:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:63:c6:80:fe", "endpoint_id": 1, "available": true, @@ -493,22 +429,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:63:c6:80:fe:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:63:c6:80:fe", "endpoint_id": 2, "available": true, @@ -535,22 +455,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:63:c6:80:fe:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:63:c6:80:fe", "endpoint_id": 3, "available": true, @@ -577,22 +481,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:63:c6:80:fe:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:63:c6:80:fe", "endpoint_id": 4, "available": true, @@ -621,22 +509,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:63:c6:80:fe:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:63:c6:80:fe", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-switch-b1laus01.json b/tests/data/devices/lumi-lumi-switch-b1laus01.json index f8b1b3699..c407bcce8 100755 --- a/tests/data/devices/lumi-lumi-switch-b1laus01.json +++ b/tests/data/devices/lumi-lumi-switch-b1laus01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "04:cf:8c:df:3c:75:da:cf", "nwk": "0xE4DB", "manufacturer": "LUMI", @@ -215,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "04:cf:8c:df:3c:75:da:cf:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:75:da:cf", "endpoint_id": 1, "available": true, @@ -263,22 +247,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "04:cf:8c:df:3c:75:da:cf:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "04:cf:8c:df:3c:75:da:cf", "endpoint_id": 1, "available": true, @@ -331,22 +299,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:75:da:cf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:75:da:cf", "endpoint_id": 1, "available": true, @@ -375,22 +327,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:75:da:cf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:75:da:cf", "endpoint_id": 1, "available": true, @@ -419,22 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "04:cf:8c:df:3c:75:da:cf:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "04:cf:8c:df:3c:75:da:cf", "endpoint_id": 1, "available": true, @@ -465,22 +385,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "04:cf:8c:df:3c:75:da:cf:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:75:da:cf", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-switch-b1naus01.json b/tests/data/devices/lumi-lumi-switch-b1naus01.json index e751aff18..65e6a7810 100755 --- a/tests/data/devices/lumi-lumi-switch-b1naus01.json +++ b/tests/data/devices/lumi-lumi-switch-b1naus01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "04:cf:8c:df:3c:76:1c:82", "nwk": "0x169D", "manufacturer": "LUMI", @@ -457,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "04:cf:8c:df:3c:76:1c:82:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:76:1c:82", "endpoint_id": 1, "available": true, @@ -505,22 +489,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "04:cf:8c:df:3c:76:1c:82:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "04:cf:8c:df:3c:76:1c:82", "endpoint_id": 1, "available": true, @@ -573,22 +541,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:76:1c:82:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:76:1c:82", "endpoint_id": 1, "available": true, @@ -617,22 +569,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "04:cf:8c:df:3c:76:1c:82:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:76:1c:82", "endpoint_id": 1, "available": true, @@ -661,22 +597,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "04:cf:8c:df:3c:76:1c:82:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "04:cf:8c:df:3c:76:1c:82", "endpoint_id": 1, "available": true, @@ -713,22 +633,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "04:cf:8c:df:3c:76:1c:82:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "04:cf:8c:df:3c:76:1c:82", "endpoint_id": 1, "available": true, @@ -748,7 +652,7 @@ "unique_id": "04:cf:8c:df:3c:76:1c:82-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -757,22 +661,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "04:cf:8c:df:3c:76:1c:82:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "04:cf:8c:df:3c:76:1c:82", "endpoint_id": 1, "available": true, @@ -781,7 +669,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "PHASE_A_MEASUREMENT" @@ -808,22 +696,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "04:cf:8c:df:3c:76:1c:82:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "04:cf:8c:df:3c:76:1c:82", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-switch-b2naus01.json b/tests/data/devices/lumi-lumi-switch-b2naus01.json index 1ad83f5c7..9a2eb60b3 100644 --- a/tests/data/devices/lumi-lumi-switch-b2naus01.json +++ b/tests/data/devices/lumi-lumi-switch-b2naus01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:af:a9:89:77", "nwk": "0xAF40", "manufacturer": "LUMI", @@ -694,22 +694,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:af:a9:89:77:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:af:a9:89:77", "endpoint_id": 1, "available": true, @@ -742,22 +726,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:af:a9:89:77:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:af:a9:89:77", "endpoint_id": 1, "available": true, @@ -786,22 +754,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:af:a9:89:77:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:af:a9:89:77", "endpoint_id": 1, "available": true, @@ -830,22 +782,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:af:a9:89:77:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:af:a9:89:77", "endpoint_id": 1, "available": true, @@ -881,22 +817,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:af:a9:89:77:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:af:a9:89:77", "endpoint_id": 1, "available": true, @@ -916,7 +836,7 @@ "unique_id": "ab:cd:ef:12:af:a9:89:77-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -925,22 +845,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:af:a9:89:77:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:af:a9:89:77", "endpoint_id": 1, "available": true, @@ -949,7 +853,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 20.7 }, @@ -973,22 +877,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:af:a9:89:77:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:af:a9:89:77", "endpoint_id": 1, "available": true, @@ -1021,22 +909,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:af:a9:89:77:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:af:a9:89:77", "endpoint_id": 1, "available": true, @@ -1071,22 +943,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:af:a9:89:77:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:af:a9:89:77", "endpoint_id": 1, "available": true, @@ -1113,22 +969,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:af:a9:89:77:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:af:a9:89:77", "endpoint_id": 2, "available": true, @@ -1157,22 +997,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:af:a9:89:77:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:af:a9:89:77", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-switch-b2nc01.json b/tests/data/devices/lumi-lumi-switch-b2nc01.json index 3dc8970cb..d755c4709 100644 --- a/tests/data/devices/lumi-lumi-switch-b2nc01.json +++ b/tests/data/devices/lumi-lumi-switch-b2nc01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c9:e1:af:79", "nwk": "0xABC3", "manufacturer": "LUMI", @@ -739,22 +739,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:c9:e1:af:79:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c9:e1:af:79", "endpoint_id": 1, "available": true, @@ -787,22 +771,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:c9:e1:af:79:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:c9:e1:af:79", "endpoint_id": 1, "available": true, @@ -853,22 +821,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:c9:e1:af:79:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:c9:e1:af:79", "endpoint_id": 2, "available": true, @@ -921,22 +873,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c9:e1:af:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c9:e1:af:79", "endpoint_id": 1, "available": true, @@ -965,22 +901,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c9:e1:af:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c9:e1:af:79", "endpoint_id": 1, "available": true, @@ -1009,22 +929,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:c9:e1:af:79:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c9:e1:af:79", "endpoint_id": 1, "available": true, @@ -1055,22 +959,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c9:e1:af:79:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c9:e1:af:79", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-switch-l1aeu1.json b/tests/data/devices/lumi-lumi-switch-l1aeu1.json index 124ac9d40..77ebe87f6 100644 --- a/tests/data/devices/lumi-lumi-switch-l1aeu1.json +++ b/tests/data/devices/lumi-lumi-switch-l1aeu1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4f:81:48:a1", "nwk": "0x9118", "manufacturer": "LUMI", @@ -238,22 +238,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:4f:81:48:a1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:81:48:a1", "endpoint_id": 1, "available": true, @@ -286,22 +270,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:4f:81:48:a1:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:4f:81:48:a1", "endpoint_id": 1, "available": true, @@ -354,22 +322,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4f:81:48:a1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:81:48:a1", "endpoint_id": 1, "available": true, @@ -398,22 +350,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4f:81:48:a1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:81:48:a1", "endpoint_id": 1, "available": true, @@ -442,22 +378,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:4f:81:48:a1:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:4f:81:48:a1", "endpoint_id": 1, "available": true, @@ -488,22 +408,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:4f:81:48:a1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:81:48:a1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-switch-l2aeu1.json b/tests/data/devices/lumi-lumi-switch-l2aeu1.json index 7170cfc00..566771a2f 100644 --- a/tests/data/devices/lumi-lumi-switch-l2aeu1.json +++ b/tests/data/devices/lumi-lumi-switch-l2aeu1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:dd:16:89:b4", "nwk": "0x3724", "manufacturer": "LUMI", @@ -281,22 +281,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:dd:16:89:b4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dd:16:89:b4", "endpoint_id": 1, "available": true, @@ -329,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:dd:16:89:b4:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:dd:16:89:b4", "endpoint_id": 1, "available": true, @@ -395,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:dd:16:89:b4:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:dd:16:89:b4", "endpoint_id": 2, "available": true, @@ -463,22 +415,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:dd:16:89:b4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dd:16:89:b4", "endpoint_id": 1, "available": true, @@ -507,22 +443,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:dd:16:89:b4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dd:16:89:b4", "endpoint_id": 1, "available": true, @@ -551,22 +471,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:dd:16:89:b4:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:dd:16:89:b4", "endpoint_id": 1, "available": true, @@ -597,22 +501,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:dd:16:89:b4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dd:16:89:b4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-switch-n0agl1.json b/tests/data/devices/lumi-lumi-switch-n0agl1.json index 59d04a6e1..8778f930f 100644 --- a/tests/data/devices/lumi-lumi-switch-n0agl1.json +++ b/tests/data/devices/lumi-lumi-switch-n0agl1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e9:c7:8a:67", "nwk": "0x8AF1", "manufacturer": "LUMI", @@ -700,22 +700,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e9:c7:8a:67:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e9:c7:8a:67", "endpoint_id": 1, "available": true, @@ -748,22 +732,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:e9:c7:8a:67:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:c7:8a:67", "endpoint_id": 1, "available": true, @@ -799,22 +767,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e9:c7:8a:67:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e9:c7:8a:67", "endpoint_id": 1, "available": true, @@ -843,22 +795,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e9:c7:8a:67:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e9:c7:8a:67", "endpoint_id": 1, "available": true, @@ -887,22 +823,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "MeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:e9:c7:8a:67:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:e9:c7:8a:67", "endpoint_id": 1, "available": true, @@ -939,22 +859,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:e9:c7:8a:67:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e9:c7:8a:67", "endpoint_id": 1, "available": true, @@ -974,7 +878,7 @@ "unique_id": "ab:cd:ef:12:e9:c7:8a:67-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -983,22 +887,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:e9:c7:8a:67:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e9:c7:8a:67", "endpoint_id": 1, "available": true, @@ -1007,7 +895,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "PHASE_A_MEASUREMENT" @@ -1032,22 +920,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:e9:c7:8a:67:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e9:c7:8a:67", "endpoint_id": 1, "available": true, @@ -1081,22 +953,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:e9:c7:8a:67:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e9:c7:8a:67", "endpoint_id": 1, "available": true, @@ -1132,22 +988,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:e9:c7:8a:67:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e9:c7:8a:67", "endpoint_id": 1, "available": true, @@ -1176,22 +1016,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e9:c7:8a:67:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e9:c7:8a:67", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-switch-n1aeu1.json b/tests/data/devices/lumi-lumi-switch-n1aeu1.json index 1ce9ffb97..25cd4eabf 100644 --- a/tests/data/devices/lumi-lumi-switch-n1aeu1.json +++ b/tests/data/devices/lumi-lumi-switch-n1aeu1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:76:e5:a3:fd", "nwk": "0x3F09", "manufacturer": "LUMI", @@ -503,22 +503,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:76:e5:a3:fd:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:76:e5:a3:fd", "endpoint_id": 1, "available": true, @@ -551,22 +535,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:76:e5:a3:fd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:76:e5:a3:fd", "endpoint_id": 1, "available": true, @@ -595,22 +563,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:76:e5:a3:fd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:76:e5:a3:fd", "endpoint_id": 1, "available": true, @@ -639,22 +591,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:76:e5:a3:fd:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:76:e5:a3:fd", "endpoint_id": 1, "available": true, @@ -691,22 +627,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:76:e5:a3:fd:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:76:e5:a3:fd", "endpoint_id": 1, "available": true, @@ -726,7 +646,7 @@ "unique_id": "ab:cd:ef:12:76:e5:a3:fd-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -735,22 +655,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:76:e5:a3:fd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:76:e5:a3:fd", "endpoint_id": 1, "available": true, @@ -759,7 +663,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 1.2, "measurement_type": "PHASE_A_MEASUREMENT" @@ -784,22 +688,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:76:e5:a3:fd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:76:e5:a3:fd", "endpoint_id": 1, "available": true, @@ -834,22 +722,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:76:e5:a3:fd:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:76:e5:a3:fd", "endpoint_id": 1, "available": true, @@ -878,22 +750,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:76:e5:a3:fd:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:76:e5:a3:fd", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-vibration-agl01.json b/tests/data/devices/lumi-lumi-vibration-agl01.json index dd37ef5ec..08f5bbfd4 100644 --- a/tests/data/devices/lumi-lumi-vibration-agl01.json +++ b/tests/data/devices/lumi-lumi-vibration-agl01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7d:e2:f1:42", "nwk": "0x6827", "manufacturer": "LUMI", @@ -247,22 +247,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:7d:e2:f1:42:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:e2:f1:42", "endpoint_id": 1, "available": true, @@ -290,22 +274,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 2, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "2:0x0500", - "unique_id": "ab:cd:ef:12:7d:e2:f1:42:2:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:e2:f1:42", "endpoint_id": 2, "available": true, @@ -335,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:7d:e2:f1:42:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:e2:f1:42", "endpoint_id": 1, "available": true, @@ -383,22 +335,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7d:e2:f1:42:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:e2:f1:42", "endpoint_id": 1, "available": true, @@ -427,22 +363,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7d:e2:f1:42:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:e2:f1:42", "endpoint_id": 1, "available": true, @@ -471,22 +391,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:7d:e2:f1:42:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:7d:e2:f1:42", "endpoint_id": 1, "available": true, @@ -523,22 +427,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:7d:e2:f1:42:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:e2:f1:42", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-vibration-aq1.json b/tests/data/devices/lumi-lumi-vibration-aq1.json index 53d63aedf..56a90ba52 100644 --- a/tests/data/devices/lumi-lumi-vibration-aq1.json +++ b/tests/data/devices/lumi-lumi-vibration-aq1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:02:af:97:27", "nwk": "0xEDBB", "manufacturer": "LUMI", @@ -291,22 +291,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "00:15:8d:00:02:af:97:27:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:af:97:27", "endpoint_id": 1, "available": true, @@ -336,22 +320,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:02:af:97:27:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:af:97:27", "endpoint_id": 1, "available": true, @@ -384,22 +352,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "VibrationBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:af:97:27:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:af:97:27", "endpoint_id": 1, "available": true, @@ -428,22 +380,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "VibrationBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:02:af:97:27:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:af:97:27", "endpoint_id": 1, "available": true, @@ -472,22 +408,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:15:8d:00:02:af:97:27:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:8d:00:02:af:97:27", "endpoint_id": 1, "available": true, @@ -524,22 +444,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "00:15:8d:00:02:af:97:27:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "00:15:8d:00:02:af:97:27", "endpoint_id": 1, "available": true, @@ -570,22 +474,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:15:8d:00:02:af:97:27:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:02:af:97:27", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lumi-lumi-weather.json b/tests/data/devices/lumi-lumi-weather.json index b8a463571..bd4347f77 100755 --- a/tests/data/devices/lumi-lumi-weather.json +++ b/tests/data/devices/lumi-lumi-weather.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:15:8d:00:05:4b:9d:1f", "nwk": "0xFF23", "manufacturer": "LUMI", @@ -216,22 +216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:15:8d:00:05:4b:9d:1f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:05:4b:9d:1f", "endpoint_id": 1, "available": true, @@ -264,22 +248,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:05:4b:9d:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:05:4b:9d:1f", "endpoint_id": 1, "available": true, @@ -308,22 +276,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:15:8d:00:05:4b:9d:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:15:8d:00:05:4b:9d:1f", "endpoint_id": 1, "available": true, @@ -352,22 +304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:15:8d:00:05:4b:9d:1f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:15:8d:00:05:4b:9d:1f", "endpoint_id": 1, "available": true, @@ -404,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "00:15:8d:00:05:4b:9d:1f:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:8d:00:05:4b:9d:1f", "endpoint_id": 1, "available": true, @@ -448,22 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PressureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0403", - "endpoint_id": 1, - "cluster": { - "id": 1027, - "name": "Pressure Measurement", - "type": "server" - }, - "id": "1:0x0403", - "unique_id": "00:15:8d:00:05:4b:9d:1f:1:0x0403", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:8d:00:05:4b:9d:1f", "endpoint_id": 1, "available": true, @@ -492,22 +396,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "00:15:8d:00:05:4b:9d:1f:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:15:8d:00:05:4b:9d:1f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lutron-lzl4bwhl01-remote.json b/tests/data/devices/lutron-lzl4bwhl01-remote.json index bdb5d7220..31730042a 100644 --- a/tests/data/devices/lutron-lzl4bwhl01-remote.json +++ b/tests/data/devices/lutron-lzl4bwhl01-remote.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ff:ff:00:0f:e7:ff:3c:b3", "nwk": "0x6824", "manufacturer": " Lutron", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ff:ff:00:0f:e7:ff:3c:b3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ff:ff:00:0f:e7:ff:3c:b3", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ff:ff:00:0f:e7:ff:3c:b3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ff:ff:00:0f:e7:ff:3c:b3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/lutron-z3-1brl.json b/tests/data/devices/lutron-z3-1brl.json index 3eb6b95f6..2565f0c2d 100644 --- a/tests/data/devices/lutron-z3-1brl.json +++ b/tests/data/devices/lutron-z3-1brl.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ff:ff:00:0f:e7:fb:f0:07", "nwk": "0x19D5", "manufacturer": "Lutron", @@ -203,22 +203,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ff:ff:00:0f:e7:fb:f0:07:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ff:ff:00:0f:e7:fb:f0:07", "endpoint_id": 1, "available": true, @@ -251,22 +235,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ff:ff:00:0f:e7:fb:f0:07:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ff:ff:00:0f:e7:fb:f0:07", "endpoint_id": 1, "available": true, @@ -295,22 +263,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ff:ff:00:0f:e7:fb:f0:07:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ff:ff:00:0f:e7:fb:f0:07", "endpoint_id": 1, "available": true, @@ -339,22 +291,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ff:ff:00:0f:e7:fb:f0:07:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ff:ff:00:0f:e7:fb:f0:07", "endpoint_id": 1, "available": true, @@ -391,22 +327,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ff:ff:00:0f:e7:fb:f0:07:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ff:ff:00:0f:e7:fb:f0:07", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/mli-tint-extendedcolor.json b/tests/data/devices/mli-tint-extendedcolor.json index 8bde795be..d79d8fee2 100644 --- a/tests/data/devices/mli-tint-extendedcolor.json +++ b/tests/data/devices/mli-tint-extendedcolor.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:72:50:2b:f4", "nwk": "0x5A8E", "manufacturer": "MLI", @@ -306,22 +306,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:72:50:2b:f4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:50:2b:f4", "endpoint_id": 1, "available": true, @@ -354,50 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:72:50:2b:f4:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:72:50:2b:f4:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:72:50:2b:f4:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:72:50:2b:f4", "endpoint_id": 1, "available": true, @@ -458,22 +398,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:72:50:2b:f4:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:72:50:2b:f4", "endpoint_id": 1, "available": true, @@ -505,22 +429,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:72:50:2b:f4:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:72:50:2b:f4", "endpoint_id": 1, "available": true, @@ -554,22 +462,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:72:50:2b:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:50:2b:f4", "endpoint_id": 1, "available": true, @@ -598,22 +490,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:72:50:2b:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:50:2b:f4", "endpoint_id": 1, "available": true, @@ -644,22 +520,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:72:50:2b:f4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:50:2b:f4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/mli-zbt-remote-all-rgbw.json b/tests/data/devices/mli-zbt-remote-all-rgbw.json index c9bf098e5..b6b4cf314 100644 --- a/tests/data/devices/mli-zbt-remote-all-rgbw.json +++ b/tests/data/devices/mli-zbt-remote-all-rgbw.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b1:2f:b5:32", "nwk": "0xEE0B", "manufacturer": "MLI", @@ -530,22 +530,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:b1:2f:b5:32:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:2f:b5:32", "endpoint_id": 1, "available": true, @@ -578,22 +562,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "TintRemoteBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:2f:b5:32:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:2f:b5:32", "endpoint_id": 1, "available": true, @@ -622,22 +590,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "TintRemoteBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:2f:b5:32:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:2f:b5:32", "endpoint_id": 1, "available": true, @@ -668,22 +620,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b1:2f:b5:32:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:2f:b5:32", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/nabu-casa-ha-connect-zbt-1.json b/tests/data/devices/nabu-casa-ha-connect-zbt-1.json index 31005d432..65903050e 100644 --- a/tests/data/devices/nabu-casa-ha-connect-zbt-1.json +++ b/tests/data/devices/nabu-casa-ha-connect-zbt-1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:49:9b:6e:bb", "nwk": "0x0000", "manufacturer": "Nabu Casa", diff --git a/tests/data/devices/namron-as-1402790.json b/tests/data/devices/namron-as-1402790.json index 046eb8272..ea4e51bc2 100644 --- a/tests/data/devices/namron-as-1402790.json +++ b/tests/data/devices/namron-as-1402790.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2f:e9:5d:02", "nwk": "0x0250", "manufacturer": "NAMRON AS", @@ -465,22 +465,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:2f:e9:5d:02:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2f:e9:5d:02", "endpoint_id": 1, "available": true, @@ -513,22 +497,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2f:e9:5d:02:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2f:e9:5d:02", "endpoint_id": 1, "available": true, @@ -557,22 +525,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2f:e9:5d:02:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2f:e9:5d:02", "endpoint_id": 1, "available": true, @@ -601,22 +553,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:2f:e9:5d:02:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:2f:e9:5d:02", "endpoint_id": 1, "available": true, @@ -636,7 +572,7 @@ "unique_id": "ab:cd:ef:12:2f:e9:5d:02-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -645,22 +581,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2f:e9:5d:02:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2f:e9:5d:02", "endpoint_id": 1, "available": true, @@ -669,7 +589,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -693,22 +613,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2f:e9:5d:02:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2f:e9:5d:02", "endpoint_id": 1, "available": true, @@ -742,22 +646,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:2f:e9:5d:02:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2f:e9:5d:02", "endpoint_id": 1, "available": true, @@ -786,22 +674,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 10, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "10:0x0019_client", - "unique_id": "ab:cd:ef:12:2f:e9:5d:02:10:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2f:e9:5d:02", "endpoint_id": 10, "available": true, diff --git a/tests/data/devices/namron-as-4512785.json b/tests/data/devices/namron-as-4512785.json index 9e92c67c2..182457059 100644 --- a/tests/data/devices/namron-as-4512785.json +++ b/tests/data/devices/namron-as-4512785.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4c:9e:2b:64", "nwk": "0xE8F9", "manufacturer": "Namron AS", @@ -620,22 +620,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, @@ -668,22 +652,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, @@ -719,22 +687,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, @@ -763,22 +715,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, @@ -807,22 +743,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, @@ -851,22 +771,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, @@ -903,22 +807,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "DeviceTemperatureClusterHandler", - "generic_id": "cluster_handler_0x0002", - "endpoint_id": 1, - "cluster": { - "id": 2, - "name": "Device Temperature", - "type": "server" - }, - "id": "1:0x0002", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0002", - "status": "INITIALIZED", - "value_attribute": "current_temperature" - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, @@ -938,7 +826,7 @@ "unique_id": "ab:cd:ef:12:4c:9e:2b:64-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -947,22 +835,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, @@ -971,7 +843,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -995,22 +867,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, @@ -1043,22 +899,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, @@ -1093,22 +933,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, @@ -1137,22 +961,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:4c:9e:2b:64:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4c:9e:2b:64", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/neuhaus-lighting-group-nlg-remote.json b/tests/data/devices/neuhaus-lighting-group-nlg-remote.json index dba810537..6c83c0169 100644 --- a/tests/data/devices/neuhaus-lighting-group-nlg-remote.json +++ b/tests/data/devices/neuhaus-lighting-group-nlg-remote.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:90:e3:16:0a", "nwk": "0xAE2B", "manufacturer": "Neuhaus Lighting Group", @@ -165,22 +165,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:90:e3:16:0a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:e3:16:0a", "endpoint_id": 1, "available": true, @@ -213,22 +197,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:90:e3:16:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:e3:16:0a", "endpoint_id": 1, "available": true, @@ -257,22 +225,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:90:e3:16:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:e3:16:0a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/niko-nv-battery-switch-2-button.json b/tests/data/devices/niko-nv-battery-switch-2-button.json index e4771523a..25200ce82 100644 --- a/tests/data/devices/niko-nv-battery-switch-2-button.json +++ b/tests/data/devices/niko-nv-battery-switch-2-button.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f1:c5:12:a4", "nwk": "0x5253", "manufacturer": "NIKO NV", @@ -249,22 +249,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f1:c5:12:a4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:c5:12:a4", "endpoint_id": 1, "available": true, @@ -297,22 +281,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f1:c5:12:a4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:c5:12:a4", "endpoint_id": 1, "available": true, @@ -341,22 +309,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f1:c5:12:a4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:c5:12:a4", "endpoint_id": 1, "available": true, @@ -385,22 +337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:f1:c5:12:a4:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:f1:c5:12:a4", "endpoint_id": 1, "available": true, @@ -439,22 +375,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f1:c5:12:a4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:c5:12:a4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/niko-nv-battery-switch-4-button.json b/tests/data/devices/niko-nv-battery-switch-4-button.json index 4c2231020..10676b58b 100644 --- a/tests/data/devices/niko-nv-battery-switch-4-button.json +++ b/tests/data/devices/niko-nv-battery-switch-4-button.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:23:5d:15:43", "nwk": "0xBD47", "manufacturer": "NIKO NV", @@ -326,22 +326,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:23:5d:15:43:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:23:5d:15:43", "endpoint_id": 1, "available": true, @@ -374,22 +358,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:23:5d:15:43:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:23:5d:15:43", "endpoint_id": 1, "available": true, @@ -418,22 +386,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:23:5d:15:43:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:23:5d:15:43", "endpoint_id": 1, "available": true, @@ -462,22 +414,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:23:5d:15:43:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:23:5d:15:43", "endpoint_id": 1, "available": true, @@ -516,22 +452,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:23:5d:15:43:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:23:5d:15:43", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/niko-nv-connectable-motor-control-3a.json b/tests/data/devices/niko-nv-connectable-motor-control-3a.json index 2efcc82ed..d0b7270ab 100644 --- a/tests/data/devices/niko-nv-connectable-motor-control-3a.json +++ b/tests/data/devices/niko-nv-connectable-motor-control-3a.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:0e:7d:6a:9a", "nwk": "0x0898", "manufacturer": "NIKO NV", @@ -408,22 +408,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:0e:7d:6a:9a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:7d:6a:9a", "endpoint_id": 1, "available": true, @@ -456,22 +440,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:0e:7d:6a:9a:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:0e:7d:6a:9a", "endpoint_id": 1, "available": true, @@ -506,22 +474,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0e:7d:6a:9a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:7d:6a:9a", "endpoint_id": 1, "available": true, @@ -550,22 +502,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0e:7d:6a:9a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:7d:6a:9a", "endpoint_id": 1, "available": true, @@ -594,22 +530,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:0e:7d:6a:9a:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:0e:7d:6a:9a", "endpoint_id": 1, "available": true, @@ -640,22 +560,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:0e:7d:6a:9a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:7d:6a:9a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/nodon-sin-4-fp-21.json b/tests/data/devices/nodon-sin-4-fp-21.json index f84917ee1..e4a845682 100644 --- a/tests/data/devices/nodon-sin-4-fp-21.json +++ b/tests/data/devices/nodon-sin-4-fp-21.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a9:41:13:af", "nwk": "0x3CFB", "manufacturer": "NodOn", @@ -467,22 +467,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:a9:41:13:af:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:41:13:af", "endpoint_id": 1, "available": true, @@ -515,22 +499,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:a9:41:13:af:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a9:41:13:af", "endpoint_id": 1, "available": true, @@ -564,22 +532,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PhillipsRemoteClusterHandler", - "generic_id": "cluster_handler_0xfc00", - "endpoint_id": 1, - "cluster": { - "id": 64512, - "name": "PilotWireCluster", - "type": "server" - }, - "id": "1:0xfc00", - "unique_id": "ab:cd:ef:12:a9:41:13:af:1:0xfc00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:41:13:af", "endpoint_id": 1, "available": true, @@ -617,22 +569,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a9:41:13:af:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:41:13:af", "endpoint_id": 1, "available": true, @@ -661,22 +597,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a9:41:13:af:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:41:13:af", "endpoint_id": 1, "available": true, @@ -705,22 +625,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:a9:41:13:af:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:a9:41:13:af", "endpoint_id": 1, "available": true, @@ -757,22 +661,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:a9:41:13:af:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:a9:41:13:af", "endpoint_id": 1, "available": true, @@ -811,22 +699,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:a9:41:13:af:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a9:41:13:af", "endpoint_id": 1, "available": true, @@ -855,22 +727,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a9:41:13:af:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:41:13:af", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/nodon-sin-4-rs-20.json b/tests/data/devices/nodon-sin-4-rs-20.json index bcf57a0c0..ba88a1c79 100644 --- a/tests/data/devices/nodon-sin-4-rs-20.json +++ b/tests/data/devices/nodon-sin-4-rs-20.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:3c:52:ae:10", "nwk": "0x6B6C", "manufacturer": "NodOn", @@ -307,22 +307,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:3c:52:ae:10:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3c:52:ae:10", "endpoint_id": 1, "available": true, @@ -355,22 +339,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:3c:52:ae:10:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3c:52:ae:10", "endpoint_id": 1, "available": true, @@ -405,22 +373,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:3c:52:ae:10:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3c:52:ae:10", "endpoint_id": 1, "available": true, @@ -452,22 +404,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:3c:52:ae:10:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3c:52:ae:10", "endpoint_id": 1, "available": true, @@ -499,22 +435,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:3c:52:ae:10:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3c:52:ae:10", "endpoint_id": 1, "available": true, @@ -546,22 +466,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:3c:52:ae:10:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3c:52:ae:10", "endpoint_id": 1, "available": true, @@ -595,22 +499,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3c:52:ae:10:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3c:52:ae:10", "endpoint_id": 1, "available": true, @@ -639,22 +527,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3c:52:ae:10:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3c:52:ae:10", "endpoint_id": 1, "available": true, @@ -683,22 +555,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:3c:52:ae:10:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3c:52:ae:10", "endpoint_id": 1, "available": true, @@ -729,22 +585,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:3c:52:ae:10:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:3c:52:ae:10", "endpoint_id": 1, "available": true, @@ -779,22 +619,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:3c:52:ae:10:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3c:52:ae:10", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/occam-temp-sensor-v1-2-jan-19-2026.json b/tests/data/devices/occam-temp-sensor-v1-2-jan-19-2026.json index 9efb80421..dea20dac8 100644 --- a/tests/data/devices/occam-temp-sensor-v1-2-jan-19-2026.json +++ b/tests/data/devices/occam-temp-sensor-v1-2-jan-19-2026.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e0:3f:81:7c", "nwk": "0x7B1C", "manufacturer": "Occam", @@ -180,22 +180,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 10, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "10:0x0003", - "unique_id": "ab:cd:ef:12:e0:3f:81:7c:10:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:3f:81:7c", "endpoint_id": 10, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 10, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "10:0x0000", - "unique_id": "ab:cd:ef:12:e0:3f:81:7c:10:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:3f:81:7c", "endpoint_id": 10, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 10, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "10:0x0000", - "unique_id": "ab:cd:ef:12:e0:3f:81:7c:10:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:3f:81:7c", "endpoint_id": 10, "available": true, @@ -316,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 10, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "10:0x0001", - "unique_id": "ab:cd:ef:12:e0:3f:81:7c:10:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:e0:3f:81:7c", "endpoint_id": 10, "available": true, @@ -366,22 +302,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 10, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "10:0x0402", - "unique_id": "ab:cd:ef:12:e0:3f:81:7c:10:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e0:3f:81:7c", "endpoint_id": 10, "available": true, @@ -410,22 +330,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 10, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "10:0x0405", - "unique_id": "ab:cd:ef:12:e0:3f:81:7c:10:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e0:3f:81:7c", "endpoint_id": 10, "available": true, diff --git a/tests/data/devices/orvibo-250bccf66c41421b91b5e3242942c164.json b/tests/data/devices/orvibo-250bccf66c41421b91b5e3242942c164.json index f0def4eed..fdd7ecfb1 100644 --- a/tests/data/devices/orvibo-250bccf66c41421b91b5e3242942c164.json +++ b/tests/data/devices/orvibo-250bccf66c41421b91b5e3242942c164.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d1:19:cf:59", "nwk": "0xF47E", "manufacturer": "ORVIBO", @@ -306,22 +306,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d1:19:cf:59:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:19:cf:59", "endpoint_id": 1, "available": true, @@ -354,50 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d1:19:cf:59:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:d1:19:cf:59:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:d1:19:cf:59:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:d1:19:cf:59", "endpoint_id": 1, "available": true, @@ -452,22 +392,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:d1:19:cf:59:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:d1:19:cf:59", "endpoint_id": 1, "available": true, @@ -499,22 +423,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:d1:19:cf:59:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:d1:19:cf:59", "endpoint_id": 1, "available": true, @@ -546,22 +454,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:d1:19:cf:59:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:d1:19:cf:59", "endpoint_id": 1, "available": true, @@ -593,22 +485,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:d1:19:cf:59:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:d1:19:cf:59", "endpoint_id": 1, "available": true, @@ -642,22 +518,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d1:19:cf:59:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:19:cf:59", "endpoint_id": 1, "available": true, @@ -686,22 +546,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d1:19:cf:59:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:19:cf:59", "endpoint_id": 1, "available": true, @@ -732,22 +576,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d1:19:cf:59:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:19:cf:59", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/osram-switch-4x-lightify.json b/tests/data/devices/osram-switch-4x-lightify.json index c11b0f39b..b15eb664b 100644 --- a/tests/data/devices/osram-switch-4x-lightify.json +++ b/tests/data/devices/osram-switch-4x-lightify.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0d:6f:00:0e:c8:d4:e7", "nwk": "0x55D9", "manufacturer": "OSRAM", @@ -780,22 +780,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:0e:c8:d4:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0e:c8:d4:e7", "endpoint_id": 1, "available": true, @@ -824,22 +808,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:0e:c8:d4:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0e:c8:d4:e7", "endpoint_id": 1, "available": true, @@ -868,22 +836,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0d:6f:00:0e:c8:d4:e7:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0d:6f:00:0e:c8:d4:e7", "endpoint_id": 1, "available": true, @@ -920,22 +872,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0d:6f:00:0e:c8:d4:e7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0e:c8:d4:e7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ou-rui-bo-cf31218e11c547179c9c9ade6a492799.json b/tests/data/devices/ou-rui-bo-cf31218e11c547179c9c9ade6a492799.json index a440e170b..26985e91b 100644 --- a/tests/data/devices/ou-rui-bo-cf31218e11c547179c9c9ade6a492799.json +++ b/tests/data/devices/ou-rui-bo-cf31218e11c547179c9c9ade6a492799.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5f:2a:3c:30", "nwk": "0xE8A0", "manufacturer": "\u6b27\u745e\u535a", @@ -185,22 +185,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:5f:2a:3c:30:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5f:2a:3c:30", "endpoint_id": 1, "available": true, @@ -233,22 +217,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "DoorLockClusterHandler", - "generic_id": "cluster_handler_0x0101", - "endpoint_id": 1, - "cluster": { - "id": 257, - "name": "Door Lock", - "type": "server" - }, - "id": "1:0x0101", - "unique_id": "ab:cd:ef:12:5f:2a:3c:30:1:0x0101", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5f:2a:3c:30", "endpoint_id": 1, "available": true, @@ -277,22 +245,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5f:2a:3c:30:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5f:2a:3c:30", "endpoint_id": 1, "available": true, @@ -321,22 +273,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5f:2a:3c:30:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5f:2a:3c:30", "endpoint_id": 1, "available": true, @@ -365,22 +301,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:5f:2a:3c:30:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:5f:2a:3c:30", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/paulmann-licht-gmbh-501-34.json b/tests/data/devices/paulmann-licht-gmbh-501-34.json index 4bddd9cb8..7fccaeefd 100644 --- a/tests/data/devices/paulmann-licht-gmbh-501-34.json +++ b/tests/data/devices/paulmann-licht-gmbh-501-34.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4e:54:ef:79", "nwk": "0x35C7", "manufacturer": "Paulmann Licht GmbH", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:4e:54:ef:79:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:54:ef:79", "endpoint_id": 1, "available": true, @@ -384,22 +368,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4e:54:ef:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:54:ef:79", "endpoint_id": 1, "available": true, @@ -428,22 +396,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4e:54:ef:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:54:ef:79", "endpoint_id": 1, "available": true, @@ -472,22 +424,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:4e:54:ef:79:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:4e:54:ef:79", "endpoint_id": 1, "available": true, @@ -524,22 +460,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "ab:cd:ef:12:4e:54:ef:79:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:4e:54:ef:79", "endpoint_id": 2, "available": true, @@ -578,22 +498,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:4e:54:ef:79:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:54:ef:79", "endpoint_id": 1, "available": true, @@ -627,22 +531,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "ab:cd:ef:12:4e:54:ef:79:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:54:ef:79", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/philips-7602031u7.json b/tests/data/devices/philips-7602031u7.json index 0fdbcbbb5..20d31867c 100644 --- a/tests/data/devices/philips-7602031u7.json +++ b/tests/data/devices/philips-7602031u7.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0b:4b:51:fc", "nwk": "0x40D1", "manufacturer": "Philips", @@ -384,22 +384,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:17:88:01:0b:4b:51:fc:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:4b:51:fc", "endpoint_id": 11, "available": true, @@ -432,50 +416,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0b:4b:51:fc:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0b:4b:51:fc:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0b:4b:51:fc:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0b:4b:51:fc", "endpoint_id": 11, "available": true, @@ -536,22 +476,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0b:4b:51:fc:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0b:4b:51:fc", "endpoint_id": 11, "available": true, @@ -583,22 +507,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0b:4b:51:fc:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:0b:4b:51:fc", "endpoint_id": 11, "available": true, @@ -632,22 +540,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0b:4b:51:fc:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:17:88:01:0b:4b:51:fc", "endpoint_id": 11, "available": true, @@ -683,22 +575,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0b:4b:51:fc:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:4b:51:fc", "endpoint_id": 11, "available": true, @@ -727,22 +603,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0b:4b:51:fc:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:4b:51:fc", "endpoint_id": 11, "available": true, @@ -773,22 +633,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "00:17:88:01:0b:4b:51:fc:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:4b:51:fc", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/philips-915005988601.json b/tests/data/devices/philips-915005988601.json index 6e1c6c73d..b85490f1d 100644 --- a/tests/data/devices/philips-915005988601.json +++ b/tests/data/devices/philips-915005988601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:72:72:fa:b6", "nwk": "0x7C85", "manufacturer": "Philips", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:72:72:fa:b6:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:72:fa:b6", "endpoint_id": 11, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:72:72:fa:b6:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:72:72:fa:b6:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:72:72:fa:b6:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:72:72:fa:b6", "endpoint_id": 11, "available": true, @@ -488,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:72:72:fa:b6:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:72:72:fa:b6", "endpoint_id": 11, "available": true, @@ -535,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:72:72:fa:b6:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:72:72:fa:b6", "endpoint_id": 11, "available": true, @@ -584,22 +492,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:72:72:fa:b6:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:72:72:fa:b6", "endpoint_id": 11, "available": true, @@ -635,22 +527,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:72:72:fa:b6:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:72:fa:b6", "endpoint_id": 11, "available": true, @@ -679,22 +555,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:72:72:fa:b6:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:72:fa:b6", "endpoint_id": 11, "available": true, @@ -725,22 +585,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:72:72:fa:b6:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:72:fa:b6", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/philips-lct014.json b/tests/data/devices/philips-lct014.json index 972ca42da..9ee96dc19 100644 --- a/tests/data/devices/philips-lct014.json +++ b/tests/data/devices/philips-lct014.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:02:4f:ea:5c", "nwk": "0x7BF1", "manufacturer": "Philips", @@ -350,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:17:88:01:02:4f:ea:5c:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:02:4f:ea:5c", "endpoint_id": 11, "available": true, @@ -398,50 +382,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:02:4f:ea:5c:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:02:4f:ea:5c:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:02:4f:ea:5c:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:02:4f:ea:5c", "endpoint_id": 11, "available": true, @@ -502,22 +442,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:02:4f:ea:5c:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:02:4f:ea:5c", "endpoint_id": 11, "available": true, @@ -549,22 +473,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:02:4f:ea:5c:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:02:4f:ea:5c", "endpoint_id": 11, "available": true, @@ -598,22 +506,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:02:4f:ea:5c:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:17:88:01:02:4f:ea:5c", "endpoint_id": 11, "available": true, @@ -649,22 +541,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:02:4f:ea:5c:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:02:4f:ea:5c", "endpoint_id": 11, "available": true, @@ -693,22 +569,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:02:4f:ea:5c:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:02:4f:ea:5c", "endpoint_id": 11, "available": true, @@ -739,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "00:17:88:01:02:4f:ea:5c:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:02:4f:ea:5c", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/philips-lct026.json b/tests/data/devices/philips-lct026.json index b94474c61..49a4c4a28 100644 --- a/tests/data/devices/philips-lct026.json +++ b/tests/data/devices/philips-lct026.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ea:c8:c2:fd", "nwk": "0x3A92", "manufacturer": "Philips", @@ -342,22 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:ea:c8:c2:fd:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:c8:c2:fd", "endpoint_id": 11, "available": true, @@ -390,50 +374,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:ea:c8:c2:fd:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:ea:c8:c2:fd:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:ea:c8:c2:fd:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:ea:c8:c2:fd", "endpoint_id": 11, "available": true, @@ -494,22 +434,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:ea:c8:c2:fd:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:ea:c8:c2:fd", "endpoint_id": 11, "available": true, @@ -541,22 +465,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:ea:c8:c2:fd:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ea:c8:c2:fd", "endpoint_id": 11, "available": true, @@ -590,22 +498,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:ea:c8:c2:fd:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ea:c8:c2:fd", "endpoint_id": 11, "available": true, @@ -641,22 +533,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:ea:c8:c2:fd:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:c8:c2:fd", "endpoint_id": 11, "available": true, @@ -685,22 +561,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:ea:c8:c2:fd:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:c8:c2:fd", "endpoint_id": 11, "available": true, @@ -731,22 +591,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:ea:c8:c2:fd:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:c8:c2:fd", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/philips-llc020.json b/tests/data/devices/philips-llc020.json index ba4c1555e..9b267a987 100644 --- a/tests/data/devices/philips-llc020.json +++ b/tests/data/devices/philips-llc020.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:01:16:e3:33", "nwk": "0x6B96", "manufacturer": "Philips", @@ -338,22 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:17:88:01:01:16:e3:33:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:01:16:e3:33", "endpoint_id": 11, "available": true, @@ -386,50 +370,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:01:16:e3:33:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:01:16:e3:33:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:01:16:e3:33:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:01:16:e3:33", "endpoint_id": 11, "available": true, @@ -490,22 +430,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:01:16:e3:33:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:01:16:e3:33", "endpoint_id": 11, "available": true, @@ -537,22 +461,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:01:16:e3:33:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:01:16:e3:33", "endpoint_id": 11, "available": true, @@ -586,22 +494,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:01:16:e3:33:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:17:88:01:01:16:e3:33", "endpoint_id": 11, "available": true, @@ -637,22 +529,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:01:16:e3:33:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:01:16:e3:33", "endpoint_id": 11, "available": true, @@ -681,22 +557,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:01:16:e3:33:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:01:16:e3:33", "endpoint_id": 11, "available": true, @@ -727,22 +587,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "00:17:88:01:01:16:e3:33:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:01:16:e3:33", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/philips-lst002.json b/tests/data/devices/philips-lst002.json index e90995e00..8696b0f75 100644 --- a/tests/data/devices/philips-lst002.json +++ b/tests/data/devices/philips-lst002.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ad:8a:89:91", "nwk": "0xC492", "manufacturer": "Philips", @@ -363,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:ad:8a:89:91:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ad:8a:89:91", "endpoint_id": 11, "available": true, @@ -411,50 +395,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:ad:8a:89:91:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:ad:8a:89:91:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:ad:8a:89:91:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:ad:8a:89:91", "endpoint_id": 11, "available": true, @@ -515,22 +455,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:ad:8a:89:91:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ad:8a:89:91", "endpoint_id": 11, "available": true, @@ -559,22 +483,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:ad:8a:89:91:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ad:8a:89:91", "endpoint_id": 11, "available": true, @@ -605,22 +513,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:ad:8a:89:91:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ad:8a:89:91", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/philips-rom001.json b/tests/data/devices/philips-rom001.json index c88848045..c7066ebc8 100644 --- a/tests/data/devices/philips-rom001.json +++ b/tests/data/devices/philips-rom001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:06:54:a7:c3", "nwk": "0x98A2", "manufacturer": "Philips", @@ -239,22 +239,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:17:88:01:06:54:a7:c3:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:54:a7:c3", "endpoint_id": 1, "available": true, @@ -287,22 +271,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:06:54:a7:c3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:54:a7:c3", "endpoint_id": 1, "available": true, @@ -331,22 +299,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:06:54:a7:c3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:54:a7:c3", "endpoint_id": 1, "available": true, @@ -375,22 +327,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:17:88:01:06:54:a7:c3:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:17:88:01:06:54:a7:c3", "endpoint_id": 1, "available": true, @@ -427,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:17:88:01:06:54:a7:c3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:54:a7:c3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/philips-rwl020.json b/tests/data/devices/philips-rwl020.json index 2085a08e0..1e5f84aa2 100644 --- a/tests/data/devices/philips-rwl020.json +++ b/tests/data/devices/philips-rwl020.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:08:07:c3:5b", "nwk": "0x2E6A", "manufacturer": "Philips", @@ -253,22 +253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 2, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "2:0x000f", - "unique_id": "00:17:88:01:08:07:c3:5b:2:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "00:17:88:01:08:07:c3:5b", "endpoint_id": 2, "available": true, @@ -298,22 +282,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 2, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "2:0x0003", - "unique_id": "00:17:88:01:08:07:c3:5b:2:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:08:07:c3:5b", "endpoint_id": 2, "available": true, @@ -346,22 +314,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:08:07:c3:5b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:08:07:c3:5b", "endpoint_id": 1, "available": true, @@ -390,22 +342,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:08:07:c3:5b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:08:07:c3:5b", "endpoint_id": 1, "available": true, @@ -434,22 +370,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "00:17:88:01:08:07:c3:5b:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:17:88:01:08:07:c3:5b", "endpoint_id": 2, "available": true, @@ -486,22 +406,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "00:17:88:01:08:07:c3:5b:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:08:07:c3:5b", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/philips-rwl021.json b/tests/data/devices/philips-rwl021.json index 7cd20b59d..0bddddd2e 100644 --- a/tests/data/devices/philips-rwl021.json +++ b/tests/data/devices/philips-rwl021.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5e:0b:f1:3f", "nwk": "0x3CF9", "manufacturer": "Philips", @@ -261,22 +261,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 2, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "2:0x000f", - "unique_id": "ab:cd:ef:12:5e:0b:f1:3f:2:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:5e:0b:f1:3f", "endpoint_id": 2, "available": true, @@ -306,22 +290,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 2, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "2:0x0003", - "unique_id": "ab:cd:ef:12:5e:0b:f1:3f:2:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:0b:f1:3f", "endpoint_id": 2, "available": true, @@ -354,22 +322,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:0b:f1:3f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:0b:f1:3f", "endpoint_id": 1, "available": true, @@ -398,22 +350,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:0b:f1:3f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:0b:f1:3f", "endpoint_id": 1, "available": true, @@ -442,22 +378,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "ab:cd:ef:12:5e:0b:f1:3f:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:5e:0b:f1:3f", "endpoint_id": 2, "available": true, @@ -494,22 +414,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "ab:cd:ef:12:5e:0b:f1:3f:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:0b:f1:3f", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/philips-sml001.json b/tests/data/devices/philips-sml001.json index f2311ebbf..5b9bcf714 100644 --- a/tests/data/devices/philips-sml001.json +++ b/tests/data/devices/philips-sml001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:06:f5:ac:71", "nwk": "0x6AD3", "manufacturer": "Philips", @@ -279,22 +279,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "00:17:88:01:06:f5:ac:71:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:f5:ac:71", "endpoint_id": 1, "available": true, @@ -322,22 +306,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "00:17:88:01:06:f5:ac:71:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "00:17:88:01:06:f5:ac:71", "endpoint_id": 2, "available": true, @@ -367,22 +335,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 2, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "2:0x0003", - "unique_id": "00:17:88:01:06:f5:ac:71:2:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:f5:ac:71", "endpoint_id": 2, "available": true, @@ -415,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "00:17:88:01:06:f5:ac:71:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "00:17:88:01:06:f5:ac:71", "endpoint_id": 2, "available": true, @@ -465,22 +401,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:06:f5:ac:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:f5:ac:71", "endpoint_id": 1, "available": true, @@ -509,22 +429,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:06:f5:ac:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:f5:ac:71", "endpoint_id": 1, "available": true, @@ -553,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "00:17:88:01:06:f5:ac:71:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:17:88:01:06:f5:ac:71", "endpoint_id": 2, "available": true, @@ -603,22 +491,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 2, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "2:0x0400", - "unique_id": "00:17:88:01:06:f5:ac:71:2:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:17:88:01:06:f5:ac:71", "endpoint_id": 2, "available": true, @@ -647,22 +519,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 2, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "2:0x0402", - "unique_id": "00:17:88:01:06:f5:ac:71:2:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:17:88:01:06:f5:ac:71", "endpoint_id": 2, "available": true, @@ -693,22 +549,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "00:17:88:01:06:f5:ac:71:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:f5:ac:71", "endpoint_id": 2, "available": true, @@ -743,22 +583,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "00:17:88:01:06:f5:ac:71:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:f5:ac:71", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/plaid-systems-ps-sprzms-slp3.json b/tests/data/devices/plaid-systems-ps-sprzms-slp3.json index 1f3060055..01e65bbfd 100644 --- a/tests/data/devices/plaid-systems-ps-sprzms-slp3.json +++ b/tests/data/devices/plaid-systems-ps-sprzms-slp3.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0d:6f:00:0e:6e:82:87", "nwk": "0x256B", "manufacturer": "PLAID SYSTEMS", @@ -205,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0d:6f:00:0e:6e:82:87:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0e:6e:82:87", "endpoint_id": 1, "available": true, @@ -253,22 +237,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:0e:6e:82:87:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0e:6e:82:87", "endpoint_id": 1, "available": true, @@ -297,22 +265,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:0e:6e:82:87:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0e:6e:82:87", "endpoint_id": 1, "available": true, @@ -341,22 +293,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0d:6f:00:0e:6e:82:87:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0d:6f:00:0e:6e:82:87", "endpoint_id": 1, "available": true, @@ -393,22 +329,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "00:0d:6f:00:0e:6e:82:87:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:0d:6f:00:0e:6e:82:87", "endpoint_id": 1, "available": true, @@ -437,22 +357,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "00:0d:6f:00:0e:6e:82:87:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:0d:6f:00:0e:6e:82:87", "endpoint_id": 1, "available": true, @@ -483,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0d:6f:00:0e:6e:82:87:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:0e:6e:82:87", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ptvo-info-ptvo-switch.json b/tests/data/devices/ptvo-info-ptvo-switch.json index 8392a5806..3b1d762ec 100644 --- a/tests/data/devices/ptvo-info-ptvo-switch.json +++ b/tests/data/devices/ptvo-info-ptvo-switch.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1a:bc:2b:a0", "nwk": "0xD408", "manufacturer": "ptvo.info", @@ -500,22 +500,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 1, "available": true, @@ -543,22 +527,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "2:0x0006_client", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:2:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 2, "available": true, @@ -586,22 +554,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "3:0x0006_client", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:3:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 3, "available": true, @@ -629,22 +581,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "4:0x0006_client", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:4:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 4, "available": true, @@ -672,22 +608,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 5, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "5:0x0006_client", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:5:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 5, "available": true, @@ -715,22 +635,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 6, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "6:0x0006_client", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:6:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 6, "available": true, @@ -760,22 +664,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 1, "available": true, @@ -804,22 +692,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 1, "available": true, @@ -848,22 +720,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 7, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "7:0x0402", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:7:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 7, "available": true, @@ -892,22 +748,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 8, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "8:0x0402", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:8:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 8, "available": true, @@ -938,22 +778,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 1, "available": true, @@ -980,22 +804,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 2, "available": true, @@ -1022,22 +830,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 3, "available": true, @@ -1064,22 +856,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 4, "available": true, @@ -1106,22 +882,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 5, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "5:0x0006", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:5:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 5, "available": true, @@ -1148,22 +908,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 6, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "6:0x0006", - "unique_id": "ab:cd:ef:12:1a:bc:2b:a0:6:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1a:bc:2b:a0", "endpoint_id": 6, "available": true, diff --git a/tests/data/devices/samjin-button.json b/tests/data/devices/samjin-button.json index 139a2c52c..654fde90e 100644 --- a/tests/data/devices/samjin-button.json +++ b/tests/data/devices/samjin-button.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:6d:97:00:01:04:35:bd", "nwk": "0x0FEC", "manufacturer": "Samjin", @@ -238,22 +238,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "28:6d:97:00:01:04:35:bd:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:6d:97:00:01:04:35:bd", "endpoint_id": 1, "available": true, @@ -283,22 +267,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "28:6d:97:00:01:04:35:bd:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:6d:97:00:01:04:35:bd", "endpoint_id": 1, "available": true, @@ -331,22 +299,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:6d:97:00:01:04:35:bd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:6d:97:00:01:04:35:bd", "endpoint_id": 1, "available": true, @@ -375,22 +327,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:6d:97:00:01:04:35:bd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:6d:97:00:01:04:35:bd", "endpoint_id": 1, "available": true, @@ -419,22 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "28:6d:97:00:01:04:35:bd:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "28:6d:97:00:01:04:35:bd", "endpoint_id": 1, "available": true, @@ -469,22 +389,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "28:6d:97:00:01:04:35:bd:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "28:6d:97:00:01:04:35:bd", "endpoint_id": 1, "available": true, @@ -515,22 +419,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:6d:97:00:01:04:35:bd:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:6d:97:00:01:04:35:bd", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/samjin-multi.json b/tests/data/devices/samjin-multi.json index c76d9deaf..dde7d2d93 100644 --- a/tests/data/devices/samjin-multi.json +++ b/tests/data/devices/samjin-multi.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:6d:97:00:01:03:15:3d", "nwk": "0x2996", "manufacturer": "Samjin", @@ -264,22 +264,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "28:6d:97:00:01:03:15:3d:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:6d:97:00:01:03:15:3d", "endpoint_id": 1, "available": true, @@ -307,22 +291,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SmartThingsAccelerationClusterHandler", - "generic_id": "cluster_handler_0xfc02", - "endpoint_id": 1, - "cluster": { - "id": 64514, - "name": "Smartthings Accelerometer", - "type": "server" - }, - "id": "1:0xfc02", - "unique_id": "28:6d:97:00:01:03:15:3d:1:0xfc02", - "status": "INITIALIZED", - "value_attribute": "acceleration" - } - ], "device_ieee": "28:6d:97:00:01:03:15:3d", "endpoint_id": 1, "available": true, @@ -352,22 +320,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "28:6d:97:00:01:03:15:3d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:6d:97:00:01:03:15:3d", "endpoint_id": 1, "available": true, @@ -400,22 +352,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:6d:97:00:01:03:15:3d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:6d:97:00:01:03:15:3d", "endpoint_id": 1, "available": true, @@ -444,22 +380,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:6d:97:00:01:03:15:3d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:6d:97:00:01:03:15:3d", "endpoint_id": 1, "available": true, @@ -488,22 +408,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "28:6d:97:00:01:03:15:3d:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "28:6d:97:00:01:03:15:3d", "endpoint_id": 1, "available": true, @@ -538,22 +442,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "28:6d:97:00:01:03:15:3d:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "28:6d:97:00:01:03:15:3d", "endpoint_id": 1, "available": true, @@ -584,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:6d:97:00:01:03:15:3d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:6d:97:00:01:03:15:3d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/samjin-water.json b/tests/data/devices/samjin-water.json index e97058d14..b48383453 100644 --- a/tests/data/devices/samjin-water.json +++ b/tests/data/devices/samjin-water.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:39:a9:8a:6b", "nwk": "0x29A8", "manufacturer": "Samjin", @@ -232,22 +232,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:39:a9:8a:6b:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:a9:8a:6b", "endpoint_id": 1, "available": true, @@ -277,22 +261,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:39:a9:8a:6b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:a9:8a:6b", "endpoint_id": 1, "available": true, @@ -325,22 +293,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:a9:8a:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:a9:8a:6b", "endpoint_id": 1, "available": true, @@ -369,22 +321,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:a9:8a:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:a9:8a:6b", "endpoint_id": 1, "available": true, @@ -413,22 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:39:a9:8a:6b:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:39:a9:8a:6b", "endpoint_id": 1, "available": true, @@ -463,22 +383,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:39:a9:8a:6b:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:39:a9:8a:6b", "endpoint_id": 1, "available": true, @@ -509,22 +413,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:39:a9:8a:6b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:a9:8a:6b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/schneider-electric-eko07259.json b/tests/data/devices/schneider-electric-eko07259.json index 935a41264..6b24cb00a 100644 --- a/tests/data/devices/schneider-electric-eko07259.json +++ b/tests/data/devices/schneider-electric-eko07259.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c8:65:ea:5c", "nwk": "0xA3BA", "manufacturer": "Schneider Electric", @@ -1515,22 +1515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -1560,22 +1544,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -1608,22 +1576,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -1687,22 +1639,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -1734,22 +1670,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -1781,22 +1701,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -1828,22 +1732,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -1875,22 +1763,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -1922,22 +1794,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -1969,22 +1825,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2016,22 +1856,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2063,22 +1887,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2110,22 +1918,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2157,22 +1949,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 2, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "2:0x0402", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:2:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 2, "available": true, @@ -2204,22 +1980,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 3, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "3:0x0402", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:3:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 3, "available": true, @@ -2251,22 +2011,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 5, - "cluster": { - "id": 1794, - "name": "SEMetering", - "type": "server" - }, - "id": "5:0x0702", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:5:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 5, "available": true, @@ -2300,22 +2044,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2350,22 +2078,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2398,22 +2110,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2446,22 +2142,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2497,22 +2177,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2550,22 +2214,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2597,22 +2245,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2645,22 +2277,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 3, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "3:0x0402", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:3:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 3, "available": true, @@ -2699,22 +2315,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "SEBasic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2743,22 +2343,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "SEBasic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2787,22 +2371,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2831,22 +2399,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2875,22 +2427,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2919,22 +2455,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "SEThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, @@ -2963,22 +2483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 2, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "2:0x0402", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:2:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 2, "available": true, @@ -3007,22 +2511,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 3, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "3:0x0402", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:3:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 3, "available": true, @@ -3051,22 +2539,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 5, - "cluster": { - "id": 1794, - "name": "SEMetering", - "type": "server" - }, - "id": "5:0x0702", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:5:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 5, "available": true, @@ -3103,22 +2575,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 5, - "cluster": { - "id": 1794, - "name": "SEMetering", - "type": "server" - }, - "id": "5:0x0702", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:5:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 5, "available": true, @@ -3157,22 +2613,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c8:65:ea:5c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:65:ea:5c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/schneider-electric-evsckt-outlet-1.json b/tests/data/devices/schneider-electric-evsckt-outlet-1.json index 3c8185822..2d23b2d10 100644 --- a/tests/data/devices/schneider-electric-evsckt-outlet-1.json +++ b/tests/data/devices/schneider-electric-evsckt-outlet-1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:47:77:a4:73", "nwk": "0x5CE5", "manufacturer": "Schneider Electric", @@ -450,22 +450,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 6, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "6:0x0003", - "unique_id": "ab:cd:ef:12:47:77:a4:73:6:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:77:a4:73", "endpoint_id": 6, "available": true, @@ -498,22 +482,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 6, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "6:0x0006", - "unique_id": "ab:cd:ef:12:47:77:a4:73:6:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:47:77:a4:73", "endpoint_id": 6, "available": true, @@ -549,22 +517,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 6, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "6:0x0000", - "unique_id": "ab:cd:ef:12:47:77:a4:73:6:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:77:a4:73", "endpoint_id": 6, "available": true, @@ -593,22 +545,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 6, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "6:0x0000", - "unique_id": "ab:cd:ef:12:47:77:a4:73:6:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:77:a4:73", "endpoint_id": 6, "available": true, @@ -637,22 +573,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 6, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "6:0x0702", - "unique_id": "ab:cd:ef:12:47:77:a4:73:6:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:47:77:a4:73", "endpoint_id": 6, "available": true, @@ -689,22 +609,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 6, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "6:0x0702", - "unique_id": "ab:cd:ef:12:47:77:a4:73:6:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:47:77:a4:73", "endpoint_id": 6, "available": true, @@ -741,22 +645,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "ab:cd:ef:12:47:77:a4:73:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:47:77:a4:73", "endpoint_id": 6, "available": true, @@ -790,22 +678,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "ab:cd:ef:12:47:77:a4:73:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:47:77:a4:73", "endpoint_id": 6, "available": true, @@ -841,22 +713,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 6, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "6:0x0006", - "unique_id": "ab:cd:ef:12:47:77:a4:73:6:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:47:77:a4:73", "endpoint_id": 6, "available": true, @@ -885,22 +741,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 6, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "6:0x0019_client", - "unique_id": "ab:cd:ef:12:47:77:a4:73:6:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:77:a4:73", "endpoint_id": 6, "available": true, diff --git a/tests/data/devices/schneider-electric-lk-dimmer.json b/tests/data/devices/schneider-electric-lk-dimmer.json index fa43bd399..045267f81 100644 --- a/tests/data/devices/schneider-electric-lk-dimmer.json +++ b/tests/data/devices/schneider-electric-lk-dimmer.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:28:80:01:79", "nwk": "0xC2FD", "manufacturer": "Schneider Electric", @@ -536,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 3, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "3:0x0003", - "unique_id": "ab:cd:ef:12:28:80:01:79:3:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:80:01:79", "endpoint_id": 3, "available": true, @@ -584,36 +568,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:28:80:01:79:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:28:80:01:79:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:28:80:01:79", "endpoint_id": 3, "available": true, @@ -667,22 +621,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:28:80:01:79:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:28:80:01:79", "endpoint_id": 3, "available": true, @@ -714,22 +652,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:28:80:01:79:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:28:80:01:79", "endpoint_id": 3, "available": true, @@ -761,22 +683,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:28:80:01:79:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:28:80:01:79", "endpoint_id": 3, "available": true, @@ -808,22 +714,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:28:80:01:79:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:28:80:01:79", "endpoint_id": 3, "available": true, @@ -857,22 +747,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 3, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "3:0x0000", - "unique_id": "ab:cd:ef:12:28:80:01:79:3:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:80:01:79", "endpoint_id": 3, "available": true, @@ -901,22 +775,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 3, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "3:0x0000", - "unique_id": "ab:cd:ef:12:28:80:01:79:3:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:80:01:79", "endpoint_id": 3, "available": true, @@ -947,22 +805,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 3, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "3:0x0019_client", - "unique_id": "ab:cd:ef:12:28:80:01:79:3:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:80:01:79", "endpoint_id": 3, "available": true, diff --git a/tests/data/devices/schneider-electric-nhmotion-unidim-1.json b/tests/data/devices/schneider-electric-nhmotion-unidim-1.json index 314f7448e..24a9e086f 100644 --- a/tests/data/devices/schneider-electric-nhmotion-unidim-1.json +++ b/tests/data/devices/schneider-electric-nhmotion-unidim-1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8f:16:4b:4b", "nwk": "0x0FA2", "manufacturer": "Schneider Electric", @@ -338,22 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 37, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "37:0x0406", - "unique_id": "ab:cd:ef:12:8f:16:4b:4b:37:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:8f:16:4b:4b", "endpoint_id": 37, "available": true, @@ -383,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 3, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "3:0x0003", - "unique_id": "ab:cd:ef:12:8f:16:4b:4b:3:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8f:16:4b:4b", "endpoint_id": 3, "available": true, @@ -431,36 +399,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:8f:16:4b:4b:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:8f:16:4b:4b:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:8f:16:4b:4b", "endpoint_id": 3, "available": true, @@ -514,22 +452,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:8f:16:4b:4b:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:8f:16:4b:4b", "endpoint_id": 3, "available": true, @@ -561,22 +483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:8f:16:4b:4b:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:8f:16:4b:4b", "endpoint_id": 3, "available": true, @@ -610,22 +516,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 3, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "3:0x0000", - "unique_id": "ab:cd:ef:12:8f:16:4b:4b:3:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8f:16:4b:4b", "endpoint_id": 3, "available": true, @@ -654,22 +544,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 3, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "3:0x0000", - "unique_id": "ab:cd:ef:12:8f:16:4b:4b:3:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8f:16:4b:4b", "endpoint_id": 3, "available": true, @@ -698,22 +572,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 37, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "37:0x0400", - "unique_id": "ab:cd:ef:12:8f:16:4b:4b:37:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:8f:16:4b:4b", "endpoint_id": 37, "available": true, @@ -744,22 +602,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 3, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "3:0x0019_client", - "unique_id": "ab:cd:ef:12:8f:16:4b:4b:3:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8f:16:4b:4b", "endpoint_id": 3, "available": true, diff --git a/tests/data/devices/schneider-electric-puck-dimmer-1.json b/tests/data/devices/schneider-electric-puck-dimmer-1.json index 1853af42e..428ed0501 100644 --- a/tests/data/devices/schneider-electric-puck-dimmer-1.json +++ b/tests/data/devices/schneider-electric-puck-dimmer-1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c9:cb:c2:ea", "nwk": "0x61DD", "manufacturer": "Schneider Electric", @@ -238,22 +238,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 3, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "3:0x0003", - "unique_id": "ab:cd:ef:12:c9:cb:c2:ea:3:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c9:cb:c2:ea", "endpoint_id": 3, "available": true, @@ -286,36 +270,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:c9:cb:c2:ea:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:c9:cb:c2:ea:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:c9:cb:c2:ea", "endpoint_id": 3, "available": true, @@ -369,22 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:c9:cb:c2:ea:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:c9:cb:c2:ea", "endpoint_id": 3, "available": true, @@ -416,22 +354,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:c9:cb:c2:ea:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:c9:cb:c2:ea", "endpoint_id": 3, "available": true, @@ -465,22 +387,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 3, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "3:0x0000", - "unique_id": "ab:cd:ef:12:c9:cb:c2:ea:3:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c9:cb:c2:ea", "endpoint_id": 3, "available": true, @@ -509,22 +415,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 3, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "3:0x0000", - "unique_id": "ab:cd:ef:12:c9:cb:c2:ea:3:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c9:cb:c2:ea", "endpoint_id": 3, "available": true, @@ -555,22 +445,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 3, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "3:0x0019_client", - "unique_id": "ab:cd:ef:12:c9:cb:c2:ea:3:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c9:cb:c2:ea", "endpoint_id": 3, "available": true, diff --git a/tests/data/devices/schneider-electric-puck-shutter-1.json b/tests/data/devices/schneider-electric-puck-shutter-1.json index 6fed2e237..349b32636 100644 --- a/tests/data/devices/schneider-electric-puck-shutter-1.json +++ b/tests/data/devices/schneider-electric-puck-shutter-1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:81:34:28:65", "nwk": "0x9634", "manufacturer": "Schneider Electric", @@ -425,22 +425,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 5, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "5:0x0003", - "unique_id": "ab:cd:ef:12:81:34:28:65:5:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:34:28:65", "endpoint_id": 5, "available": true, @@ -473,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 5, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "5:0x0102", - "unique_id": "ab:cd:ef:12:81:34:28:65:5:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:81:34:28:65", "endpoint_id": 5, "available": true, @@ -523,22 +491,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 5, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "5:0x0102", - "unique_id": "ab:cd:ef:12:81:34:28:65:5:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:81:34:28:65", "endpoint_id": 5, "available": true, @@ -570,22 +522,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 5, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "5:0x0102", - "unique_id": "ab:cd:ef:12:81:34:28:65:5:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:81:34:28:65", "endpoint_id": 5, "available": true, @@ -617,22 +553,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 5, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "5:0x0102", - "unique_id": "ab:cd:ef:12:81:34:28:65:5:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:81:34:28:65", "endpoint_id": 5, "available": true, @@ -664,22 +584,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 5, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "5:0x0102", - "unique_id": "ab:cd:ef:12:81:34:28:65:5:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:81:34:28:65", "endpoint_id": 5, "available": true, @@ -713,22 +617,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 5, - "cluster": { - "id": 0, - "name": "SEBasic", - "type": "server" - }, - "id": "5:0x0000", - "unique_id": "ab:cd:ef:12:81:34:28:65:5:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:34:28:65", "endpoint_id": 5, "available": true, @@ -757,22 +645,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 5, - "cluster": { - "id": 0, - "name": "SEBasic", - "type": "server" - }, - "id": "5:0x0000", - "unique_id": "ab:cd:ef:12:81:34:28:65:5:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:34:28:65", "endpoint_id": 5, "available": true, @@ -801,22 +673,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 5, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "5:0x0102", - "unique_id": "ab:cd:ef:12:81:34:28:65:5:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:81:34:28:65", "endpoint_id": 5, "available": true, @@ -847,22 +703,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 5, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "5:0x0102", - "unique_id": "ab:cd:ef:12:81:34:28:65:5:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:81:34:28:65", "endpoint_id": 5, "available": true, @@ -897,22 +737,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 5, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "5:0x0019_client", - "unique_id": "ab:cd:ef:12:81:34:28:65:5:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:34:28:65", "endpoint_id": 5, "available": true, diff --git a/tests/data/devices/schneider-electric-s520619.json b/tests/data/devices/schneider-electric-s520619.json index cec957825..90d4770a1 100644 --- a/tests/data/devices/schneider-electric-s520619.json +++ b/tests/data/devices/schneider-electric-s520619.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a2:e6:bb:a6", "nwk": "0x9A73", "manufacturer": "Schneider Electric", @@ -597,22 +597,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 4, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "4:0x0406", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:4:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 4, "available": true, @@ -642,22 +626,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 1, "available": true, @@ -690,22 +658,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 1, "available": true, @@ -769,22 +721,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 1, "available": true, @@ -816,22 +752,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 1, "available": true, @@ -865,22 +785,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 1, "available": true, @@ -917,22 +821,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 1, "available": true, @@ -961,22 +849,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 1, "available": true, @@ -1005,22 +877,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 1, "available": true, @@ -1049,22 +905,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 1, "available": true, @@ -1093,22 +933,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 1, "available": true, @@ -1137,22 +961,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 2, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "2:0x0402", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:2:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 2, "available": true, @@ -1181,22 +989,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 5, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "5:0x0702", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:5:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 5, "available": true, @@ -1233,22 +1025,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 5, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "5:0x0702", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:5:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 5, "available": true, @@ -1287,22 +1063,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a2:e6:bb:a6:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:e6:bb:a6", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/schneider-electric-socket-outlet-1.json b/tests/data/devices/schneider-electric-socket-outlet-1.json index 922647e31..bd3392a1d 100644 --- a/tests/data/devices/schneider-electric-socket-outlet-1.json +++ b/tests/data/devices/schneider-electric-socket-outlet-1.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:81:8a:da:20", "nwk": "0x7C85", "manufacturer": "Schneider Electric", @@ -540,22 +540,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 6, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "6:0x0003", - "unique_id": "ab:cd:ef:12:81:8a:da:20:6:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:8a:da:20", "endpoint_id": 6, "available": true, @@ -588,22 +572,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 6, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "6:0x0006", - "unique_id": "ab:cd:ef:12:81:8a:da:20:6:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:81:8a:da:20", "endpoint_id": 6, "available": true, @@ -639,22 +607,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 6, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "6:0x0000", - "unique_id": "ab:cd:ef:12:81:8a:da:20:6:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:8a:da:20", "endpoint_id": 6, "available": true, @@ -683,22 +635,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 6, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "6:0x0000", - "unique_id": "ab:cd:ef:12:81:8a:da:20:6:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:8a:da:20", "endpoint_id": 6, "available": true, @@ -727,22 +663,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 6, - "cluster": { - "id": 1794, - "name": "MeteringCluster", - "type": "server" - }, - "id": "6:0x0702", - "unique_id": "ab:cd:ef:12:81:8a:da:20:6:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:81:8a:da:20", "endpoint_id": 6, "available": true, @@ -779,22 +699,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 6, - "cluster": { - "id": 1794, - "name": "MeteringCluster", - "type": "server" - }, - "id": "6:0x0702", - "unique_id": "ab:cd:ef:12:81:8a:da:20:6:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:81:8a:da:20", "endpoint_id": 6, "available": true, @@ -831,22 +735,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "ab:cd:ef:12:81:8a:da:20:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:81:8a:da:20", "endpoint_id": 6, "available": true, @@ -880,22 +768,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "ab:cd:ef:12:81:8a:da:20:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:81:8a:da:20", "endpoint_id": 6, "available": true, @@ -931,22 +803,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 6, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "6:0x0006", - "unique_id": "ab:cd:ef:12:81:8a:da:20:6:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:81:8a:da:20", "endpoint_id": 6, "available": true, @@ -975,22 +831,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 6, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "6:0x0019_client", - "unique_id": "ab:cd:ef:12:81:8a:da:20:6:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:8a:da:20", "endpoint_id": 6, "available": true, diff --git a/tests/data/devices/schneider-electric-socket-outlet-2.json b/tests/data/devices/schneider-electric-socket-outlet-2.json index 4976ab9a5..86db1990a 100644 --- a/tests/data/devices/schneider-electric-socket-outlet-2.json +++ b/tests/data/devices/schneider-electric-socket-outlet-2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:bc:ec:d0:94", "nwk": "0x673E", "manufacturer": "Schneider Electric", @@ -540,22 +540,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 6, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "6:0x0003", - "unique_id": "ab:cd:ef:12:bc:ec:d0:94:6:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bc:ec:d0:94", "endpoint_id": 6, "available": true, @@ -588,22 +572,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 6, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "6:0x0006", - "unique_id": "ab:cd:ef:12:bc:ec:d0:94:6:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:bc:ec:d0:94", "endpoint_id": 6, "available": true, @@ -639,22 +607,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 6, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "6:0x0000", - "unique_id": "ab:cd:ef:12:bc:ec:d0:94:6:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bc:ec:d0:94", "endpoint_id": 6, "available": true, @@ -683,22 +635,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 6, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "6:0x0000", - "unique_id": "ab:cd:ef:12:bc:ec:d0:94:6:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bc:ec:d0:94", "endpoint_id": 6, "available": true, @@ -727,22 +663,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 6, - "cluster": { - "id": 1794, - "name": "MeteringCluster", - "type": "server" - }, - "id": "6:0x0702", - "unique_id": "ab:cd:ef:12:bc:ec:d0:94:6:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:bc:ec:d0:94", "endpoint_id": 6, "available": true, @@ -779,22 +699,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 6, - "cluster": { - "id": 1794, - "name": "MeteringCluster", - "type": "server" - }, - "id": "6:0x0702", - "unique_id": "ab:cd:ef:12:bc:ec:d0:94:6:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:bc:ec:d0:94", "endpoint_id": 6, "available": true, @@ -831,22 +735,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "ab:cd:ef:12:bc:ec:d0:94:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:bc:ec:d0:94", "endpoint_id": 6, "available": true, @@ -880,22 +768,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 6, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "6:0x0b04", - "unique_id": "ab:cd:ef:12:bc:ec:d0:94:6:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:bc:ec:d0:94", "endpoint_id": 6, "available": true, @@ -931,22 +803,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 6, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "6:0x0006", - "unique_id": "ab:cd:ef:12:bc:ec:d0:94:6:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:bc:ec:d0:94", "endpoint_id": 6, "available": true, @@ -975,22 +831,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 6, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "6:0x0019_client", - "unique_id": "ab:cd:ef:12:bc:ec:d0:94:6:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bc:ec:d0:94", "endpoint_id": 6, "available": true, diff --git a/tests/data/devices/securifi-ltd-unk-model.json b/tests/data/devices/securifi-ltd-unk-model.json index 01f4c6e8a..6b199428e 100644 --- a/tests/data/devices/securifi-ltd-unk-model.json +++ b/tests/data/devices/securifi-ltd-unk-model.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0d:6f:00:05:49:ac:68", "nwk": "0xE51C", "manufacturer": "Securifi Ltd.", @@ -372,22 +372,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0d:6f:00:05:49:ac:68:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:05:49:ac:68", "endpoint_id": 1, "available": true, @@ -420,22 +404,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:05:49:ac:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:05:49:ac:68", "endpoint_id": 1, "available": true, @@ -464,22 +432,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:05:49:ac:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:05:49:ac:68", "endpoint_id": 1, "available": true, @@ -499,7 +451,7 @@ "unique_id": "00:0d:6f:00:05:49:ac:68-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -508,22 +460,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:0d:6f:00:05:49:ac:68:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:0d:6f:00:05:49:ac:68", "endpoint_id": 1, "available": true, @@ -532,7 +468,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "PHASE_A_MEASUREMENT" @@ -557,22 +493,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:0d:6f:00:05:49:ac:68:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:0d:6f:00:05:49:ac:68", "endpoint_id": 1, "available": true, @@ -606,22 +526,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:0d:6f:00:05:49:ac:68:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:0d:6f:00:05:49:ac:68", "endpoint_id": 1, "available": true, @@ -654,22 +558,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:0d:6f:00:05:49:ac:68:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:0d:6f:00:05:49:ac:68", "endpoint_id": 1, "available": true, @@ -703,22 +591,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "00:0d:6f:00:05:49:ac:68:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "00:0d:6f:00:05:49:ac:68", "endpoint_id": 1, "available": true, @@ -754,22 +626,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:0d:6f:00:05:49:ac:68:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:0d:6f:00:05:49:ac:68", "endpoint_id": 1, "available": true, @@ -798,22 +654,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0d:6f:00:05:49:ac:68:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:05:49:ac:68", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sengled-e11-g13.json b/tests/data/devices/sengled-e11-g13.json index 2e9385eec..522eb7a95 100644 --- a/tests/data/devices/sengled-e11-g13.json +++ b/tests/data/devices/sengled-e11-g13.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "b0:ce:18:14:03:3a:9b:48", "nwk": "0xCAC7", "manufacturer": "sengled", @@ -325,22 +325,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "b0:ce:18:14:03:3a:9b:48:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:3a:9b:48", "endpoint_id": 1, "available": true, @@ -373,36 +357,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b0:ce:18:14:03:3a:9b:48:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:03:3a:9b:48:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b0:ce:18:14:03:3a:9b:48", "endpoint_id": 1, "available": true, @@ -456,22 +410,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:03:3a:9b:48:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b0:ce:18:14:03:3a:9b:48", "endpoint_id": 1, "available": true, @@ -505,22 +443,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:3a:9b:48:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:3a:9b:48", "endpoint_id": 1, "available": true, @@ -549,22 +471,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:3a:9b:48:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:3a:9b:48", "endpoint_id": 1, "available": true, @@ -593,22 +499,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:3a:9b:48:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:3a:9b:48", "endpoint_id": 1, "available": true, @@ -645,22 +535,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:3a:9b:48:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:3a:9b:48", "endpoint_id": 1, "available": true, @@ -699,22 +573,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "b0:ce:18:14:03:3a:9b:48:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:3a:9b:48", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sengled-e12-n14.json b/tests/data/devices/sengled-e12-n14.json index c5e5daf2b..2a2e5a45f 100644 --- a/tests/data/devices/sengled-e12-n14.json +++ b/tests/data/devices/sengled-e12-n14.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "b0:ce:18:14:03:09:c6:15", "nwk": "0xE369", "manufacturer": "sengled", @@ -319,22 +319,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "b0:ce:18:14:03:09:c6:15:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:09:c6:15", "endpoint_id": 1, "available": true, @@ -367,36 +351,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b0:ce:18:14:03:09:c6:15:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:03:09:c6:15:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b0:ce:18:14:03:09:c6:15", "endpoint_id": 1, "available": true, @@ -450,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:03:09:c6:15:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b0:ce:18:14:03:09:c6:15", "endpoint_id": 1, "available": true, @@ -499,22 +437,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:09:c6:15:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:09:c6:15", "endpoint_id": 1, "available": true, @@ -543,22 +465,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:09:c6:15:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:09:c6:15", "endpoint_id": 1, "available": true, @@ -587,22 +493,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:09:c6:15:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:09:c6:15", "endpoint_id": 1, "available": true, @@ -639,22 +529,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:09:c6:15:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:09:c6:15", "endpoint_id": 1, "available": true, @@ -693,22 +567,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "b0:ce:18:14:03:09:c6:15:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:09:c6:15", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sengled-e12-n1e.json b/tests/data/devices/sengled-e12-n1e.json index f1bd1ccd3..20fb5f127 100644 --- a/tests/data/devices/sengled-e12-n1e.json +++ b/tests/data/devices/sengled-e12-n1e.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "b0:ce:18:14:03:53:34:69", "nwk": "0x410C", "manufacturer": "sengled", @@ -422,22 +422,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "b0:ce:18:14:03:53:34:69:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:53:34:69", "endpoint_id": 1, "available": true, @@ -470,50 +454,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b0:ce:18:14:03:53:34:69:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:03:53:34:69:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "b0:ce:18:14:03:53:34:69:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "b0:ce:18:14:03:53:34:69", "endpoint_id": 1, "available": true, @@ -572,22 +512,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:53:34:69:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:53:34:69", "endpoint_id": 1, "available": true, @@ -616,22 +540,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:53:34:69:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:53:34:69", "endpoint_id": 1, "available": true, @@ -660,22 +568,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:53:34:69:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:53:34:69", "endpoint_id": 1, "available": true, @@ -712,22 +604,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:53:34:69:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:53:34:69", "endpoint_id": 1, "available": true, @@ -766,22 +642,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "b0:ce:18:14:03:53:34:69:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:53:34:69", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sengled-e1c-nb6.json b/tests/data/devices/sengled-e1c-nb6.json index 6e5b89fba..a86d57dbe 100644 --- a/tests/data/devices/sengled-e1c-nb6.json +++ b/tests/data/devices/sengled-e1c-nb6.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "b0:ce:18:14:00:04:2d:f3", "nwk": "0x3C7D", "manufacturer": "sengled", @@ -166,22 +166,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "b0:ce:18:14:00:04:2d:f3:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:04:2d:f3", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:00:04:2d:f3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:04:2d:f3", "endpoint_id": 1, "available": true, @@ -258,22 +226,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:00:04:2d:f3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:04:2d:f3", "endpoint_id": 1, "available": true, @@ -304,22 +256,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b0:ce:18:14:00:04:2d:f3:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "b0:ce:18:14:00:04:2d:f3", "endpoint_id": 1, "available": true, @@ -348,22 +284,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "b0:ce:18:14:00:04:2d:f3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:04:2d:f3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sengled-e1c-nb7.json b/tests/data/devices/sengled-e1c-nb7.json index 907381730..2d4ab23bf 100644 --- a/tests/data/devices/sengled-e1c-nb7.json +++ b/tests/data/devices/sengled-e1c-nb7.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "b0:ce:18:14:03:6b:9a:ee", "nwk": "0xB27C", "manufacturer": "sengled", @@ -288,22 +288,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "b0:ce:18:14:03:6b:9a:ee:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:6b:9a:ee", "endpoint_id": 1, "available": true, @@ -336,22 +320,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b0:ce:18:14:03:6b:9a:ee:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "b0:ce:18:14:03:6b:9a:ee", "endpoint_id": 1, "available": true, @@ -387,22 +355,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:6b:9a:ee:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:6b:9a:ee", "endpoint_id": 1, "available": true, @@ -431,22 +383,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:6b:9a:ee:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:6b:9a:ee", "endpoint_id": 1, "available": true, @@ -475,22 +411,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:6b:9a:ee:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:6b:9a:ee", "endpoint_id": 1, "available": true, @@ -527,22 +447,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:6b:9a:ee:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:6b:9a:ee", "endpoint_id": 1, "available": true, @@ -581,22 +485,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b0:ce:18:14:03:6b:9a:ee:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "b0:ce:18:14:03:6b:9a:ee", "endpoint_id": 1, "available": true, @@ -625,22 +513,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "b0:ce:18:14:03:6b:9a:ee:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:6b:9a:ee", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sengled-e1f-n9g.json b/tests/data/devices/sengled-e1f-n9g.json index 76770c10a..415f4bfd6 100644 --- a/tests/data/devices/sengled-e1f-n9g.json +++ b/tests/data/devices/sengled-e1f-n9g.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "b0:ce:18:14:00:1c:86:48", "nwk": "0x50BF", "manufacturer": "sengled", @@ -337,22 +337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "b0:ce:18:14:00:1c:86:48:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:1c:86:48", "endpoint_id": 1, "available": true, @@ -385,36 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b0:ce:18:14:00:1c:86:48:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:00:1c:86:48:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b0:ce:18:14:00:1c:86:48", "endpoint_id": 1, "available": true, @@ -468,22 +422,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:00:1c:86:48:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b0:ce:18:14:00:1c:86:48", "endpoint_id": 1, "available": true, @@ -517,22 +455,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:00:1c:86:48:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:1c:86:48", "endpoint_id": 1, "available": true, @@ -561,22 +483,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:00:1c:86:48:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:1c:86:48", "endpoint_id": 1, "available": true, @@ -605,22 +511,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:00:1c:86:48:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:00:1c:86:48", "endpoint_id": 1, "available": true, @@ -657,22 +547,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:00:1c:86:48:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:00:1c:86:48", "endpoint_id": 1, "available": true, @@ -711,22 +585,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "b0:ce:18:14:00:1c:86:48:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:1c:86:48", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sengled-e1g-g8e.json b/tests/data/devices/sengled-e1g-g8e.json index 0c0e496eb..21ca4a001 100755 --- a/tests/data/devices/sengled-e1g-g8e.json +++ b/tests/data/devices/sengled-e1g-g8e.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "b0:ce:18:14:03:63:f2:6a", "nwk": "0xF1CD", "manufacturer": "sengled", @@ -428,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "b0:ce:18:14:03:63:f2:6a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:63:f2:6a", "endpoint_id": 1, "available": true, @@ -476,50 +460,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b0:ce:18:14:03:63:f2:6a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:03:63:f2:6a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "b0:ce:18:14:03:63:f2:6a:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "b0:ce:18:14:03:63:f2:6a", "endpoint_id": 1, "available": true, @@ -578,22 +518,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:63:f2:6a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:63:f2:6a", "endpoint_id": 1, "available": true, @@ -622,22 +546,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:63:f2:6a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:63:f2:6a", "endpoint_id": 1, "available": true, @@ -666,22 +574,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:63:f2:6a:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:63:f2:6a", "endpoint_id": 1, "available": true, @@ -718,22 +610,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:63:f2:6a:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:63:f2:6a", "endpoint_id": 1, "available": true, @@ -772,22 +648,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "b0:ce:18:14:03:63:f2:6a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:63:f2:6a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sengled-e21-n1ea.json b/tests/data/devices/sengled-e21-n1ea.json index 8f1921380..a575be4d7 100644 --- a/tests/data/devices/sengled-e21-n1ea.json +++ b/tests/data/devices/sengled-e21-n1ea.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "b0:ce:18:14:00:18:57:68", "nwk": "0x4FEB", "manufacturer": "sengled", @@ -428,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:18:57:68", "endpoint_id": 1, "available": true, @@ -476,50 +460,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "b0:ce:18:14:00:18:57:68", "endpoint_id": 1, "available": true, @@ -578,22 +518,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "b0:ce:18:14:00:18:57:68", "endpoint_id": 1, "available": true, @@ -625,22 +549,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b0:ce:18:14:00:18:57:68", "endpoint_id": 1, "available": true, @@ -672,22 +580,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b0:ce:18:14:00:18:57:68", "endpoint_id": 1, "available": true, @@ -721,22 +613,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:18:57:68", "endpoint_id": 1, "available": true, @@ -765,22 +641,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:18:57:68", "endpoint_id": 1, "available": true, @@ -809,22 +669,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:00:18:57:68", "endpoint_id": 1, "available": true, @@ -861,22 +705,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:00:18:57:68", "endpoint_id": 1, "available": true, @@ -915,22 +743,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "b0:ce:18:14:00:18:57:68:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:00:18:57:68", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sengled-z01-a19nae26.json b/tests/data/devices/sengled-z01-a19nae26.json index 39c38c4ed..f9dd33b8f 100644 --- a/tests/data/devices/sengled-z01-a19nae26.json +++ b/tests/data/devices/sengled-z01-a19nae26.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "b0:ce:18:14:03:01:1d:28", "nwk": "0x2D0E", "manufacturer": "sengled", @@ -404,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "b0:ce:18:14:03:01:1d:28:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:01:1d:28", "endpoint_id": 1, "available": true, @@ -452,50 +436,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b0:ce:18:14:03:01:1d:28:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:03:01:1d:28:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "b0:ce:18:14:03:01:1d:28:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "b0:ce:18:14:03:01:1d:28", "endpoint_id": 1, "available": true, @@ -550,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b0:ce:18:14:03:01:1d:28:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b0:ce:18:14:03:01:1d:28", "endpoint_id": 1, "available": true, @@ -599,22 +523,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:01:1d:28:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:01:1d:28", "endpoint_id": 1, "available": true, @@ -643,22 +551,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b0:ce:18:14:03:01:1d:28:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:01:1d:28", "endpoint_id": 1, "available": true, @@ -687,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:01:1d:28:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:01:1d:28", "endpoint_id": 1, "available": true, @@ -739,22 +615,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "b0:ce:18:14:03:01:1d:28:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "b0:ce:18:14:03:01:1d:28", "endpoint_id": 1, "available": true, @@ -793,22 +653,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "b0:ce:18:14:03:01:1d:28:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b0:ce:18:14:03:01:1d:28", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sercomm-corp-sz-esw01-au.json b/tests/data/devices/sercomm-corp-sz-esw01-au.json index f7d0fdeb2..831759844 100644 --- a/tests/data/devices/sercomm-corp-sz-esw01-au.json +++ b/tests/data/devices/sercomm-corp-sz-esw01-au.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:42:61:67:6a", "nwk": "0x88CB", "manufacturer": "Sercomm Corp.", @@ -567,22 +567,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, @@ -615,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, @@ -683,22 +651,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, @@ -727,22 +679,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, @@ -771,22 +707,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, @@ -823,22 +743,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, @@ -866,7 +770,7 @@ "unique_id": "ab:cd:ef:12:42:61:67:6a-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -875,22 +779,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, @@ -899,7 +787,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.256, "measurement_type": "PHASE_A_MEASUREMENT", @@ -925,22 +813,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, @@ -974,22 +846,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, @@ -1022,22 +878,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, @@ -1072,22 +912,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, @@ -1124,22 +948,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:42:61:67:6a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:42:61:67:6a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/shelly-1pm.json b/tests/data/devices/shelly-1pm.json index 4930d2675..80efa9df7 100644 --- a/tests/data/devices/shelly-1pm.json +++ b/tests/data/devices/shelly-1pm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e7:d6:bf:0a", "nwk": "0xE0AE", "manufacturer": "Shelly", @@ -609,22 +609,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e7:d6:bf:0a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:d6:bf:0a", "endpoint_id": 1, "available": true, @@ -657,22 +641,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:d6:bf:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:d6:bf:0a", "endpoint_id": 1, "available": true, @@ -701,22 +669,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:d6:bf:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:d6:bf:0a", "endpoint_id": 1, "available": true, @@ -745,22 +697,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:e7:d6:bf:0a:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:e7:d6:bf:0a", "endpoint_id": 1, "available": true, @@ -797,22 +733,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:e7:d6:bf:0a:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:e7:d6:bf:0a", "endpoint_id": 1, "available": true, @@ -840,7 +760,7 @@ "unique_id": "ab:cd:ef:12:e7:d6:bf:0a-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -849,22 +769,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:e7:d6:bf:0a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e7:d6:bf:0a", "endpoint_id": 1, "available": true, @@ -873,7 +777,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -898,22 +802,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:e7:d6:bf:0a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e7:d6:bf:0a", "endpoint_id": 1, "available": true, @@ -947,22 +835,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:e7:d6:bf:0a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e7:d6:bf:0a", "endpoint_id": 1, "available": true, @@ -996,22 +868,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:e7:d6:bf:0a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e7:d6:bf:0a", "endpoint_id": 1, "available": true, @@ -1047,22 +903,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:e7:d6:bf:0a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e7:d6:bf:0a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/shelly-2pm.json b/tests/data/devices/shelly-2pm.json index 882850b8f..8e7de0c8d 100644 --- a/tests/data/devices/shelly-2pm.json +++ b/tests/data/devices/shelly-2pm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:9c:bd:cb:14", "nwk": "0xB908", "manufacturer": "Shelly", @@ -258,22 +258,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:9c:bd:cb:14:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9c:bd:cb:14", "endpoint_id": 1, "available": true, @@ -306,22 +290,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:9c:bd:cb:14:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:9c:bd:cb:14", "endpoint_id": 1, "available": true, @@ -356,22 +324,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9c:bd:cb:14:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9c:bd:cb:14", "endpoint_id": 1, "available": true, @@ -400,22 +352,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9c:bd:cb:14:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9c:bd:cb:14", "endpoint_id": 1, "available": true, @@ -444,22 +380,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:9c:bd:cb:14:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:9c:bd:cb:14", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/shelly-dimmer.json b/tests/data/devices/shelly-dimmer.json index 163498b64..e57e08e6c 100644 --- a/tests/data/devices/shelly-dimmer.json +++ b/tests/data/devices/shelly-dimmer.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:28:23:e1:0e", "nwk": "0x6460", "manufacturer": "Shelly", @@ -627,22 +627,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, @@ -675,36 +659,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, @@ -758,22 +712,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, @@ -805,22 +743,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, @@ -852,22 +774,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, @@ -901,22 +807,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, @@ -952,22 +842,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, @@ -996,22 +870,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, @@ -1040,22 +898,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, @@ -1083,7 +925,7 @@ "unique_id": "ab:cd:ef:12:28:23:e1:0e-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1092,22 +934,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, @@ -1116,7 +942,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -1141,22 +967,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, @@ -1190,22 +1000,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:28:23:e1:0e:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:28:23:e1:0e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/shelly-ecowitt-ws90.json b/tests/data/devices/shelly-ecowitt-ws90.json index a42a483ee..0938cb8a0 100644 --- a/tests/data/devices/shelly-ecowitt-ws90.json +++ b/tests/data/devices/shelly-ecowitt-ws90.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a6:a9:96:8e", "nwk": "0x2695", "manufacturer": "Shelly", @@ -224,22 +224,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc03", - "endpoint_id": 1, - "cluster": { - "id": 64515, - "name": "Shelly Rain Cluster", - "type": "server" - }, - "id": "1:0xfc03", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0xfc03", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -269,22 +253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -317,22 +285,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -361,22 +313,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -405,22 +341,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -455,22 +375,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -499,22 +403,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -543,22 +431,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PressureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0403", - "endpoint_id": 1, - "cluster": { - "id": 1027, - "name": "Pressure Measurement", - "type": "server" - }, - "id": "1:0x0403", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0x0403", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -587,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -631,22 +487,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc01", - "endpoint_id": 1, - "cluster": { - "id": 64513, - "name": "Shelly Wind Cluster", - "type": "server" - }, - "id": "1:0xfc01", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0xfc01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -675,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc03", - "endpoint_id": 1, - "cluster": { - "id": 64515, - "name": "Shelly Rain Cluster", - "type": "server" - }, - "id": "1:0xfc03", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0xfc03", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -719,22 +543,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc02", - "endpoint_id": 1, - "cluster": { - "id": 64514, - "name": "Shelly UV Cluster", - "type": "server" - }, - "id": "1:0xfc02", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0xfc02", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -763,22 +571,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc01", - "endpoint_id": 1, - "cluster": { - "id": 64513, - "name": "Shelly Wind Cluster", - "type": "server" - }, - "id": "1:0xfc01", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0xfc01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, @@ -807,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfc01", - "endpoint_id": 1, - "cluster": { - "id": 64513, - "name": "Shelly Wind Cluster", - "type": "server" - }, - "id": "1:0xfc01", - "unique_id": "ab:cd:ef:12:a6:a9:96:8e:1:0xfc01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:a9:96:8e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/shelly-mini1pm.json b/tests/data/devices/shelly-mini1pm.json index 4723d4dc9..d198d726a 100644 --- a/tests/data/devices/shelly-mini1pm.json +++ b/tests/data/devices/shelly-mini1pm.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6a:0d:2c:ef", "nwk": "0x04B4", "manufacturer": "Shelly", @@ -518,22 +518,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:6a:0d:2c:ef:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:0d:2c:ef", "endpoint_id": 1, "available": true, @@ -566,22 +550,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6a:0d:2c:ef:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:0d:2c:ef", "endpoint_id": 1, "available": true, @@ -610,22 +578,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6a:0d:2c:ef:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:0d:2c:ef", "endpoint_id": 1, "available": true, @@ -654,22 +606,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:6a:0d:2c:ef:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:6a:0d:2c:ef", "endpoint_id": 1, "available": true, @@ -706,22 +642,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:6a:0d:2c:ef:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:6a:0d:2c:ef", "endpoint_id": 1, "available": true, @@ -749,7 +669,7 @@ "unique_id": "ab:cd:ef:12:6a:0d:2c:ef-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -758,22 +678,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:6a:0d:2c:ef:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:6a:0d:2c:ef", "endpoint_id": 1, "available": true, @@ -782,7 +686,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 2.2, "measurement_type": "ACTIVE_MEASUREMENT" @@ -807,22 +711,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:6a:0d:2c:ef:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:6a:0d:2c:ef", "endpoint_id": 1, "available": true, @@ -856,22 +744,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:6a:0d:2c:ef:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:6a:0d:2c:ef", "endpoint_id": 1, "available": true, @@ -905,22 +777,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:6a:0d:2c:ef:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:6a:0d:2c:ef", "endpoint_id": 1, "available": true, @@ -956,22 +812,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:6a:0d:2c:ef:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:6a:0d:2c:ef", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/shyugj-dimmer-switch-zb3-0.json b/tests/data/devices/shyugj-dimmer-switch-zb3-0.json index a31af0025..701f368b0 100644 --- a/tests/data/devices/shyugj-dimmer-switch-zb3-0.json +++ b/tests/data/devices/shyugj-dimmer-switch-zb3-0.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:43:59:bd:59", "nwk": "0xA3E8", "manufacturer": "Shyugj", @@ -281,22 +281,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:43:59:bd:59:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:59:bd:59", "endpoint_id": 1, "available": true, @@ -329,36 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:43:59:bd:59:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:43:59:bd:59:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:43:59:bd:59", "endpoint_id": 1, "available": true, @@ -412,22 +366,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:43:59:bd:59:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:43:59:bd:59", "endpoint_id": 1, "available": true, @@ -461,22 +399,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:43:59:bd:59:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:59:bd:59", "endpoint_id": 1, "available": true, @@ -505,22 +427,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:43:59:bd:59:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:59:bd:59", "endpoint_id": 1, "available": true, @@ -551,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:43:59:bd:59:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:59:bd:59", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-lca001.json b/tests/data/devices/signify-netherlands-b-v-lca001.json index 5872e4c91..852bd2ebf 100644 --- a/tests/data/devices/signify-netherlands-b-v-lca001.json +++ b/tests/data/devices/signify-netherlands-b-v-lca001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7d:0f:71:cd", "nwk": "0x6E98", "manufacturer": "Signify Netherlands B.V.", @@ -367,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:7d:0f:71:cd:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:0f:71:cd", "endpoint_id": 11, "available": true, @@ -415,50 +399,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:7d:0f:71:cd:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:7d:0f:71:cd:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:7d:0f:71:cd:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:7d:0f:71:cd", "endpoint_id": 11, "available": true, @@ -519,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:7d:0f:71:cd:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:7d:0f:71:cd", "endpoint_id": 11, "available": true, @@ -566,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:7d:0f:71:cd:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:7d:0f:71:cd", "endpoint_id": 11, "available": true, @@ -615,22 +523,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:7d:0f:71:cd:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:7d:0f:71:cd", "endpoint_id": 11, "available": true, @@ -666,22 +558,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:7d:0f:71:cd:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:0f:71:cd", "endpoint_id": 11, "available": true, @@ -710,22 +586,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:7d:0f:71:cd:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:0f:71:cd", "endpoint_id": 11, "available": true, @@ -756,22 +616,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:7d:0f:71:cd:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7d:0f:71:cd", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-lca005.json b/tests/data/devices/signify-netherlands-b-v-lca005.json index 18b37eef4..aabe10692 100644 --- a/tests/data/devices/signify-netherlands-b-v-lca005.json +++ b/tests/data/devices/signify-netherlands-b-v-lca005.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0b:6d:bc:5c", "nwk": "0x8F2B", "manufacturer": "Signify Netherlands B.V.", @@ -348,22 +348,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:17:88:01:0b:6d:bc:5c:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:6d:bc:5c", "endpoint_id": 11, "available": true, @@ -396,50 +380,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0b:6d:bc:5c:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0b:6d:bc:5c:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0b:6d:bc:5c:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0b:6d:bc:5c", "endpoint_id": 11, "available": true, @@ -500,22 +440,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0b:6d:bc:5c:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0b:6d:bc:5c", "endpoint_id": 11, "available": true, @@ -547,22 +471,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0b:6d:bc:5c:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:0b:6d:bc:5c", "endpoint_id": 11, "available": true, @@ -596,22 +504,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0b:6d:bc:5c:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:17:88:01:0b:6d:bc:5c", "endpoint_id": 11, "available": true, @@ -647,22 +539,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0b:6d:bc:5c:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:6d:bc:5c", "endpoint_id": 11, "available": true, @@ -691,22 +567,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0b:6d:bc:5c:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:6d:bc:5c", "endpoint_id": 11, "available": true, @@ -737,22 +597,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "00:17:88:01:0b:6d:bc:5c:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:6d:bc:5c", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-lca007.json b/tests/data/devices/signify-netherlands-b-v-lca007.json index 44894461a..461abd49b 100644 --- a/tests/data/devices/signify-netherlands-b-v-lca007.json +++ b/tests/data/devices/signify-netherlands-b-v-lca007.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0c:6e:be:18", "nwk": "0xF148", "manufacturer": "Signify Netherlands B.V.", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:17:88:01:0c:6e:be:18:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:6e:be:18", "endpoint_id": 11, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0c:6e:be:18:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0c:6e:be:18:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0c:6e:be:18:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0c:6e:be:18", "endpoint_id": 11, "available": true, @@ -488,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0c:6e:be:18:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0c:6e:be:18", "endpoint_id": 11, "available": true, @@ -535,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0c:6e:be:18:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:0c:6e:be:18", "endpoint_id": 11, "available": true, @@ -584,22 +492,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0c:6e:be:18:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:17:88:01:0c:6e:be:18", "endpoint_id": 11, "available": true, @@ -635,22 +527,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0c:6e:be:18:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:6e:be:18", "endpoint_id": 11, "available": true, @@ -679,22 +555,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0c:6e:be:18:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:6e:be:18", "endpoint_id": 11, "available": true, @@ -725,22 +585,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "00:17:88:01:0c:6e:be:18:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:6e:be:18", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-lcb001.json b/tests/data/devices/signify-netherlands-b-v-lcb001.json index b47b15055..1c5794f6c 100644 --- a/tests/data/devices/signify-netherlands-b-v-lcb001.json +++ b/tests/data/devices/signify-netherlands-b-v-lcb001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:06:0b:87:56", "nwk": "0x3940", "manufacturer": "Signify Netherlands B.V.", @@ -373,22 +373,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:17:88:01:06:0b:87:56:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:0b:87:56", "endpoint_id": 11, "available": true, @@ -421,50 +405,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:06:0b:87:56:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:06:0b:87:56:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:06:0b:87:56:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:06:0b:87:56", "endpoint_id": 11, "available": true, @@ -525,22 +465,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:06:0b:87:56:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:06:0b:87:56", "endpoint_id": 11, "available": true, @@ -572,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:06:0b:87:56:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:06:0b:87:56", "endpoint_id": 11, "available": true, @@ -621,22 +529,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:06:0b:87:56:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:17:88:01:06:0b:87:56", "endpoint_id": 11, "available": true, @@ -672,22 +564,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:06:0b:87:56:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:0b:87:56", "endpoint_id": 11, "available": true, @@ -716,22 +592,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:06:0b:87:56:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:0b:87:56", "endpoint_id": 11, "available": true, @@ -762,22 +622,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "00:17:88:01:06:0b:87:56:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:06:0b:87:56", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-lcb002.json b/tests/data/devices/signify-netherlands-b-v-lcb002.json index 5e56f542c..316230002 100755 --- a/tests/data/devices/signify-netherlands-b-v-lcb002.json +++ b/tests/data/devices/signify-netherlands-b-v-lcb002.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0d:01:9c:a3", "nwk": "0x9F48", "manufacturer": "Signify Netherlands B.V.", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:17:88:01:0d:01:9c:a3:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:01:9c:a3", "endpoint_id": 11, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0d:01:9c:a3:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0d:01:9c:a3:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0d:01:9c:a3:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0d:01:9c:a3", "endpoint_id": 11, "available": true, @@ -488,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0d:01:9c:a3:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0d:01:9c:a3", "endpoint_id": 11, "available": true, @@ -535,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0d:01:9c:a3:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:0d:01:9c:a3", "endpoint_id": 11, "available": true, @@ -584,22 +492,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0d:01:9c:a3:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:17:88:01:0d:01:9c:a3", "endpoint_id": 11, "available": true, @@ -635,22 +527,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0d:01:9c:a3:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:01:9c:a3", "endpoint_id": 11, "available": true, @@ -679,22 +555,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0d:01:9c:a3:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:01:9c:a3", "endpoint_id": 11, "available": true, @@ -725,22 +585,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "00:17:88:01:0d:01:9c:a3:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:01:9c:a3", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-lce001.json b/tests/data/devices/signify-netherlands-b-v-lce001.json index 952a2d2fd..f6847bb9d 100644 --- a/tests/data/devices/signify-netherlands-b-v-lce001.json +++ b/tests/data/devices/signify-netherlands-b-v-lce001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0d:5b:93:1a", "nwk": "0xAA8F", "manufacturer": "Signify Netherlands B.V.", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:17:88:01:0d:5b:93:1a:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:5b:93:1a", "endpoint_id": 11, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0d:5b:93:1a:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0d:5b:93:1a:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0d:5b:93:1a:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0d:5b:93:1a", "endpoint_id": 11, "available": true, @@ -488,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0d:5b:93:1a:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0d:5b:93:1a", "endpoint_id": 11, "available": true, @@ -535,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0d:5b:93:1a:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:0d:5b:93:1a", "endpoint_id": 11, "available": true, @@ -584,22 +492,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0d:5b:93:1a:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:17:88:01:0d:5b:93:1a", "endpoint_id": 11, "available": true, @@ -635,22 +527,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0d:5b:93:1a:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:5b:93:1a", "endpoint_id": 11, "available": true, @@ -679,22 +555,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0d:5b:93:1a:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:5b:93:1a", "endpoint_id": 11, "available": true, @@ -725,22 +585,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "00:17:88:01:0d:5b:93:1a:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:5b:93:1a", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-lcg006.json b/tests/data/devices/signify-netherlands-b-v-lcg006.json index 3c1125ff4..8f016d09d 100644 --- a/tests/data/devices/signify-netherlands-b-v-lcg006.json +++ b/tests/data/devices/signify-netherlands-b-v-lcg006.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a8:67:e6:a3", "nwk": "0xE5F4", "manufacturer": "Signify Netherlands B.V.", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:a8:67:e6:a3:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:67:e6:a3", "endpoint_id": 11, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:a8:67:e6:a3:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:a8:67:e6:a3:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:a8:67:e6:a3:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:a8:67:e6:a3", "endpoint_id": 11, "available": true, @@ -488,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:a8:67:e6:a3:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:a8:67:e6:a3", "endpoint_id": 11, "available": true, @@ -535,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:a8:67:e6:a3:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:a8:67:e6:a3", "endpoint_id": 11, "available": true, @@ -584,22 +492,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:a8:67:e6:a3:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a8:67:e6:a3", "endpoint_id": 11, "available": true, @@ -635,22 +527,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:a8:67:e6:a3:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:67:e6:a3", "endpoint_id": 11, "available": true, @@ -679,22 +555,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:a8:67:e6:a3:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:67:e6:a3", "endpoint_id": 11, "available": true, @@ -725,22 +585,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:a8:67:e6:a3:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:67:e6:a3", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-lcx004.json b/tests/data/devices/signify-netherlands-b-v-lcx004.json index efe82b55c..05cd48a3c 100644 --- a/tests/data/devices/signify-netherlands-b-v-lcx004.json +++ b/tests/data/devices/signify-netherlands-b-v-lcx004.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:16:33:04:fc", "nwk": "0xAD32", "manufacturer": "Signify Netherlands B.V.", @@ -330,22 +330,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "ab:cd:ef:12:16:33:04:fc:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:16:33:04:fc", "endpoint_id": 11, "available": true, @@ -378,50 +362,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:16:33:04:fc:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:16:33:04:fc:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:16:33:04:fc:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:16:33:04:fc", "endpoint_id": 11, "available": true, @@ -482,22 +422,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "ab:cd:ef:12:16:33:04:fc:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:16:33:04:fc", "endpoint_id": 11, "available": true, @@ -529,22 +453,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "ab:cd:ef:12:16:33:04:fc:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:16:33:04:fc", "endpoint_id": 11, "available": true, @@ -578,22 +486,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "ab:cd:ef:12:16:33:04:fc:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:16:33:04:fc", "endpoint_id": 11, "available": true, @@ -629,22 +521,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:16:33:04:fc:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:16:33:04:fc", "endpoint_id": 11, "available": true, @@ -673,22 +549,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "ab:cd:ef:12:16:33:04:fc:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:16:33:04:fc", "endpoint_id": 11, "available": true, @@ -719,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:16:33:04:fc:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:16:33:04:fc", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-lta010.json b/tests/data/devices/signify-netherlands-b-v-lta010.json index 77c7a199e..c66213401 100644 --- a/tests/data/devices/signify-netherlands-b-v-lta010.json +++ b/tests/data/devices/signify-netherlands-b-v-lta010.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0c:e2:78:72", "nwk": "0x6C10", "manufacturer": "Signify Netherlands B.V.", @@ -330,22 +330,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:17:88:01:0c:e2:78:72:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:e2:78:72", "endpoint_id": 11, "available": true, @@ -378,50 +362,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0c:e2:78:72:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0c:e2:78:72:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0c:e2:78:72:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0c:e2:78:72", "endpoint_id": 11, "available": true, @@ -476,22 +416,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0c:e2:78:72:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0c:e2:78:72", "endpoint_id": 11, "available": true, @@ -523,22 +447,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0c:e2:78:72:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:0c:e2:78:72", "endpoint_id": 11, "available": true, @@ -572,22 +480,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0c:e2:78:72:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:17:88:01:0c:e2:78:72", "endpoint_id": 11, "available": true, @@ -623,22 +515,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0c:e2:78:72:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:e2:78:72", "endpoint_id": 11, "available": true, @@ -667,22 +543,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0c:e2:78:72:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:e2:78:72", "endpoint_id": 11, "available": true, @@ -713,22 +573,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "00:17:88:01:0c:e2:78:72:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:e2:78:72", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-ltb003.json b/tests/data/devices/signify-netherlands-b-v-ltb003.json index 3d4ac30fb..421e9bd27 100755 --- a/tests/data/devices/signify-netherlands-b-v-ltb003.json +++ b/tests/data/devices/signify-netherlands-b-v-ltb003.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0d:00:32:fb", "nwk": "0x754C", "manufacturer": "Signify Netherlands B.V.", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:17:88:01:0d:00:32:fb:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:00:32:fb", "endpoint_id": 11, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0d:00:32:fb:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0d:00:32:fb:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0d:00:32:fb:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0d:00:32:fb", "endpoint_id": 11, "available": true, @@ -482,22 +422,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 11, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "11:0x0300", - "unique_id": "00:17:88:01:0d:00:32:fb:11:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "00:17:88:01:0d:00:32:fb", "endpoint_id": 11, "available": true, @@ -529,22 +453,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0d:00:32:fb:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:0d:00:32:fb", "endpoint_id": 11, "available": true, @@ -578,22 +486,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0d:00:32:fb:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:17:88:01:0d:00:32:fb", "endpoint_id": 11, "available": true, @@ -629,22 +521,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0d:00:32:fb:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:00:32:fb", "endpoint_id": 11, "available": true, @@ -673,22 +549,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0d:00:32:fb:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:00:32:fb", "endpoint_id": 11, "available": true, @@ -719,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "00:17:88:01:0d:00:32:fb:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:00:32:fb", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-lwa003.json b/tests/data/devices/signify-netherlands-b-v-lwa003.json index 2d9fb331b..447265bce 100755 --- a/tests/data/devices/signify-netherlands-b-v-lwa003.json +++ b/tests/data/devices/signify-netherlands-b-v-lwa003.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0c:76:6c:d5", "nwk": "0x1A5B", "manufacturer": "Signify Netherlands B.V.", @@ -245,22 +245,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 11, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "11:0x0003", - "unique_id": "00:17:88:01:0c:76:6c:d5:11:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:76:6c:d5", "endpoint_id": 11, "available": true, @@ -293,36 +277,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0c:76:6c:d5:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0c:76:6c:d5:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:0c:76:6c:d5", "endpoint_id": 11, "available": true, @@ -376,22 +330,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 11, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "11:0x0008", - "unique_id": "00:17:88:01:0c:76:6c:d5:11:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "00:17:88:01:0c:76:6c:d5", "endpoint_id": 11, "available": true, @@ -425,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 11, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "11:0x0006", - "unique_id": "00:17:88:01:0c:76:6c:d5:11:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:17:88:01:0c:76:6c:d5", "endpoint_id": 11, "available": true, @@ -476,22 +398,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0c:76:6c:d5:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:76:6c:d5", "endpoint_id": 11, "available": true, @@ -520,22 +426,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 11, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "11:0x0000", - "unique_id": "00:17:88:01:0c:76:6c:d5:11:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:76:6c:d5", "endpoint_id": 11, "available": true, @@ -566,22 +456,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "00:17:88:01:0c:76:6c:d5:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:76:6c:d5", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-rdm001.json b/tests/data/devices/signify-netherlands-b-v-rdm001.json index e364dfb3b..56e08a7d3 100644 --- a/tests/data/devices/signify-netherlands-b-v-rdm001.json +++ b/tests/data/devices/signify-netherlands-b-v-rdm001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0b:02:b6:79", "nwk": "0x6AAA", "manufacturer": "Signify Netherlands B.V.", @@ -203,22 +203,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:17:88:01:0b:02:b6:79:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:02:b6:79", "endpoint_id": 1, "available": true, @@ -251,22 +235,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsWallSwitchBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:0b:02:b6:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:02:b6:79", "endpoint_id": 1, "available": true, @@ -295,22 +263,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsWallSwitchBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:0b:02:b6:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:02:b6:79", "endpoint_id": 1, "available": true, @@ -339,22 +291,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:17:88:01:0b:02:b6:79:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:17:88:01:0b:02:b6:79", "endpoint_id": 1, "available": true, @@ -391,22 +327,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:17:88:01:0b:02:b6:79:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0b:02:b6:79", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-rdm002.json b/tests/data/devices/signify-netherlands-b-v-rdm002.json index a38e49165..8ee140705 100644 --- a/tests/data/devices/signify-netherlands-b-v-rdm002.json +++ b/tests/data/devices/signify-netherlands-b-v-rdm002.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0d:13:48:33", "nwk": "0x987E", "manufacturer": "Signify Netherlands B.V.", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:17:88:01:0d:13:48:33:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:13:48:33", "endpoint_id": 1, "available": true, @@ -269,22 +253,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:0d:13:48:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:13:48:33", "endpoint_id": 1, "available": true, @@ -313,22 +281,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:0d:13:48:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:13:48:33", "endpoint_id": 1, "available": true, @@ -357,22 +309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:17:88:01:0d:13:48:33:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:17:88:01:0d:13:48:33", "endpoint_id": 1, "available": true, @@ -409,22 +345,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:17:88:01:0d:13:48:33:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0d:13:48:33", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-rdm004.json b/tests/data/devices/signify-netherlands-b-v-rdm004.json index bdba88634..60a44682d 100644 --- a/tests/data/devices/signify-netherlands-b-v-rdm004.json +++ b/tests/data/devices/signify-netherlands-b-v-rdm004.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:84:06:58:23", "nwk": "0x0AAD", "manufacturer": "Signify Netherlands B.V.", @@ -202,22 +202,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:84:06:58:23:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:84:06:58:23", "endpoint_id": 1, "available": true, @@ -250,22 +234,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsWallSwitchBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:84:06:58:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:84:06:58:23", "endpoint_id": 1, "available": true, @@ -294,22 +262,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsWallSwitchBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:84:06:58:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:84:06:58:23", "endpoint_id": 1, "available": true, @@ -338,22 +290,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:84:06:58:23:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:84:06:58:23", "endpoint_id": 1, "available": true, @@ -390,22 +326,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:84:06:58:23:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:84:06:58:23", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-rdm005.json b/tests/data/devices/signify-netherlands-b-v-rdm005.json index 778bbfdc9..cde5c4be9 100644 --- a/tests/data/devices/signify-netherlands-b-v-rdm005.json +++ b/tests/data/devices/signify-netherlands-b-v-rdm005.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e5:df:74:89", "nwk": "0xC06A", "manufacturer": "Signify Netherlands B.V.", @@ -228,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e5:df:74:89:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:df:74:89", "endpoint_id": 1, "available": true, @@ -276,22 +260,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e5:df:74:89:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:df:74:89", "endpoint_id": 1, "available": true, @@ -320,22 +288,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e5:df:74:89:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:df:74:89", "endpoint_id": 1, "available": true, @@ -364,22 +316,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:e5:df:74:89:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:e5:df:74:89", "endpoint_id": 1, "available": true, @@ -416,22 +352,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e5:df:74:89:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:df:74:89", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-rwl022.json b/tests/data/devices/signify-netherlands-b-v-rwl022.json index f4ffc3ec7..26a15e2a2 100644 --- a/tests/data/devices/signify-netherlands-b-v-rwl022.json +++ b/tests/data/devices/signify-netherlands-b-v-rwl022.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0c:26:42:ec", "nwk": "0xB45A", "manufacturer": "Signify Netherlands B.V.", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:17:88:01:0c:26:42:ec:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:26:42:ec", "endpoint_id": 1, "available": true, @@ -269,22 +253,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:0c:26:42:ec:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:26:42:ec", "endpoint_id": 1, "available": true, @@ -313,22 +281,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "PhilipsBasicCluster", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:17:88:01:0c:26:42:ec:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:26:42:ec", "endpoint_id": 1, "available": true, @@ -357,22 +309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:17:88:01:0c:26:42:ec:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:17:88:01:0c:26:42:ec", "endpoint_id": 1, "available": true, @@ -409,22 +345,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:17:88:01:0c:26:42:ec:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:26:42:ec", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-sml003.json b/tests/data/devices/signify-netherlands-b-v-sml003.json index b069d8f22..71dbf94c7 100644 --- a/tests/data/devices/signify-netherlands-b-v-sml003.json +++ b/tests/data/devices/signify-netherlands-b-v-sml003.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d5:c9:be:9b", "nwk": "0x0868", "manufacturer": "Signify Netherlands B.V.", @@ -243,22 +243,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "ab:cd:ef:12:d5:c9:be:9b:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:d5:c9:be:9b", "endpoint_id": 2, "available": true, @@ -286,22 +270,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "2:0x0006_client", - "unique_id": "ab:cd:ef:12:d5:c9:be:9b:2:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:c9:be:9b", "endpoint_id": 2, "available": true, @@ -331,22 +299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 2, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "2:0x0003", - "unique_id": "ab:cd:ef:12:d5:c9:be:9b:2:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:c9:be:9b", "endpoint_id": 2, "available": true, @@ -379,22 +331,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "ab:cd:ef:12:d5:c9:be:9b:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:d5:c9:be:9b", "endpoint_id": 2, "available": true, @@ -431,22 +367,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "ab:cd:ef:12:d5:c9:be:9b:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:c9:be:9b", "endpoint_id": 2, "available": true, @@ -475,22 +395,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "ab:cd:ef:12:d5:c9:be:9b:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:c9:be:9b", "endpoint_id": 2, "available": true, @@ -519,22 +423,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "ab:cd:ef:12:d5:c9:be:9b:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:d5:c9:be:9b", "endpoint_id": 2, "available": true, @@ -569,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 2, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "2:0x0400", - "unique_id": "ab:cd:ef:12:d5:c9:be:9b:2:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d5:c9:be:9b", "endpoint_id": 2, "available": true, @@ -613,22 +485,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 2, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "2:0x0402", - "unique_id": "ab:cd:ef:12:d5:c9:be:9b:2:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d5:c9:be:9b", "endpoint_id": 2, "available": true, @@ -659,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "ab:cd:ef:12:d5:c9:be:9b:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:c9:be:9b", "endpoint_id": 2, "available": true, @@ -709,22 +549,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "ab:cd:ef:12:d5:c9:be:9b:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:c9:be:9b", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/signify-netherlands-b-v-sml004.json b/tests/data/devices/signify-netherlands-b-v-sml004.json index 17a3bc244..cc8cda62d 100644 --- a/tests/data/devices/signify-netherlands-b-v-sml004.json +++ b/tests/data/devices/signify-netherlands-b-v-sml004.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:17:88:01:0c:dc:9d:61", "nwk": "0x464E", "manufacturer": "Signify Netherlands B.V.", @@ -243,22 +243,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "00:17:88:01:0c:dc:9d:61:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "00:17:88:01:0c:dc:9d:61", "endpoint_id": 2, "available": true, @@ -286,22 +270,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "2:0x0006_client", - "unique_id": "00:17:88:01:0c:dc:9d:61:2:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:dc:9d:61", "endpoint_id": 2, "available": true, @@ -331,22 +299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 2, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "2:0x0003", - "unique_id": "00:17:88:01:0c:dc:9d:61:2:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:dc:9d:61", "endpoint_id": 2, "available": true, @@ -379,22 +331,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "00:17:88:01:0c:dc:9d:61:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "00:17:88:01:0c:dc:9d:61", "endpoint_id": 2, "available": true, @@ -431,22 +367,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "00:17:88:01:0c:dc:9d:61:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:dc:9d:61", "endpoint_id": 2, "available": true, @@ -475,22 +395,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "00:17:88:01:0c:dc:9d:61:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:dc:9d:61", "endpoint_id": 2, "available": true, @@ -519,22 +423,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "00:17:88:01:0c:dc:9d:61:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:17:88:01:0c:dc:9d:61", "endpoint_id": 2, "available": true, @@ -569,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 2, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "2:0x0400", - "unique_id": "00:17:88:01:0c:dc:9d:61:2:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:17:88:01:0c:dc:9d:61", "endpoint_id": 2, "available": true, @@ -613,22 +485,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 2, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "2:0x0402", - "unique_id": "00:17:88:01:0c:dc:9d:61:2:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "00:17:88:01:0c:dc:9d:61", "endpoint_id": 2, "available": true, @@ -659,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 2, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "2:0x0000", - "unique_id": "00:17:88:01:0c:dc:9d:61:2:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:dc:9d:61", "endpoint_id": 2, "available": true, @@ -709,22 +549,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "00:17:88:01:0c:dc:9d:61:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:17:88:01:0c:dc:9d:61", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/sinope-technologies-va4220zb.json b/tests/data/devices/sinope-technologies-va4220zb.json index a5ec99428..dd7b7d8b9 100644 --- a/tests/data/devices/sinope-technologies-va4220zb.json +++ b/tests/data/devices/sinope-technologies-va4220zb.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:eb:f1:4d:07", "nwk": "0x05D7", "manufacturer": "Sinope Technologies", @@ -464,22 +464,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, @@ -507,22 +491,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, @@ -552,22 +520,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, @@ -600,22 +552,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, @@ -649,22 +585,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, @@ -693,22 +613,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, @@ -737,22 +641,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, @@ -781,22 +669,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "FlowMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0404", - "endpoint_id": 1, - "cluster": { - "id": 1028, - "name": "Flow Measurement", - "type": "server" - }, - "id": "1:0x0404", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0404", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, @@ -825,22 +697,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, @@ -877,22 +733,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, @@ -931,22 +771,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, @@ -975,22 +799,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:eb:f1:4d:07:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:f1:4d:07", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/smarthjemmet-dk-quad-zig-sw.json b/tests/data/devices/smarthjemmet-dk-quad-zig-sw.json index bc3c7a515..668882d51 100644 --- a/tests/data/devices/smarthjemmet-dk-quad-zig-sw.json +++ b/tests/data/devices/smarthjemmet-dk-quad-zig-sw.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:35:6f:4f:77", "nwk": "0x226D", "manufacturer": "smarthjemmet.dk", @@ -282,22 +282,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:35:6f:4f:77:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:6f:4f:77", "endpoint_id": 1, "available": true, @@ -326,22 +310,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:35:6f:4f:77:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:6f:4f:77", "endpoint_id": 1, "available": true, @@ -370,22 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:35:6f:4f:77:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:35:6f:4f:77", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/smarthjemmet-dk-quad-zig-sw2.json b/tests/data/devices/smarthjemmet-dk-quad-zig-sw2.json index 3e5602dce..5e8f971be 100644 --- a/tests/data/devices/smarthjemmet-dk-quad-zig-sw2.json +++ b/tests/data/devices/smarthjemmet-dk-quad-zig-sw2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:35:e9:d5:e0", "nwk": "0x75D4", "manufacturer": "smarthjemmet.dk", @@ -401,22 +401,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:35:e9:d5:e0:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:e9:d5:e0", "endpoint_id": 1, "available": true, @@ -444,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "2:0x0006_client", - "unique_id": "ab:cd:ef:12:35:e9:d5:e0:2:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:e9:d5:e0", "endpoint_id": 2, "available": true, @@ -487,22 +455,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "3:0x0006_client", - "unique_id": "ab:cd:ef:12:35:e9:d5:e0:3:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:e9:d5:e0", "endpoint_id": 3, "available": true, @@ -530,22 +482,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "4:0x0006_client", - "unique_id": "ab:cd:ef:12:35:e9:d5:e0:4:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:e9:d5:e0", "endpoint_id": 4, "available": true, @@ -573,22 +509,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 5, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "5:0x0006_client", - "unique_id": "ab:cd:ef:12:35:e9:d5:e0:5:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:e9:d5:e0", "endpoint_id": 5, "available": true, @@ -618,22 +538,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:35:e9:d5:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:e9:d5:e0", "endpoint_id": 1, "available": true, @@ -662,22 +566,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:35:e9:d5:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:35:e9:d5:e0", "endpoint_id": 1, "available": true, @@ -706,22 +594,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:35:e9:d5:e0:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:35:e9:d5:e0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/smartthings-multiv4.json b/tests/data/devices/smartthings-multiv4.json index ef9625b3e..bea5a16ab 100644 --- a/tests/data/devices/smartthings-multiv4.json +++ b/tests/data/devices/smartthings-multiv4.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:85:6f:e5:ee", "nwk": "0xE8FB", "manufacturer": "SmartThings", @@ -252,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:85:6f:e5:ee:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:6f:e5:ee", "endpoint_id": 1, "available": true, @@ -295,22 +279,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "ab:cd:ef:12:85:6f:e5:ee:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:85:6f:e5:ee", "endpoint_id": 1, "available": true, @@ -338,22 +306,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SmartThingsAccelerationClusterHandler", - "generic_id": "cluster_handler_0xfc02", - "endpoint_id": 1, - "cluster": { - "id": 64514, - "name": "CentraLite Accelerometer", - "type": "server" - }, - "id": "1:0xfc02", - "unique_id": "ab:cd:ef:12:85:6f:e5:ee:1:0xfc02", - "status": "INITIALIZED", - "value_attribute": "acceleration" - } - ], "device_ieee": "ab:cd:ef:12:85:6f:e5:ee", "endpoint_id": 1, "available": true, @@ -383,22 +335,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:85:6f:e5:ee:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:6f:e5:ee", "endpoint_id": 1, "available": true, @@ -431,22 +367,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:6f:e5:ee:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:6f:e5:ee", "endpoint_id": 1, "available": true, @@ -475,22 +395,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:6f:e5:ee:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:6f:e5:ee", "endpoint_id": 1, "available": true, @@ -519,22 +423,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:85:6f:e5:ee:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:85:6f:e5:ee", "endpoint_id": 1, "available": true, @@ -569,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:85:6f:e5:ee:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:85:6f:e5:ee", "endpoint_id": 1, "available": true, @@ -615,22 +487,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:85:6f:e5:ee:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:6f:e5:ee", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/smartthings-tagv4.json b/tests/data/devices/smartthings-tagv4.json index 885b2f858..4f5162d45 100644 --- a/tests/data/devices/smartthings-tagv4.json +++ b/tests/data/devices/smartthings-tagv4.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "24:fd:5b:00:01:01:4f:5d", "nwk": "0x5E17", "manufacturer": "SmartThings", @@ -193,22 +193,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "24:fd:5b:00:01:01:4f:5d:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "24:fd:5b:00:01:01:4f:5d", "endpoint_id": 1, "available": true, @@ -238,22 +222,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "24:fd:5b:00:01:01:4f:5d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "24:fd:5b:00:01:01:4f:5d", "endpoint_id": 1, "available": true, @@ -286,22 +254,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "24:fd:5b:00:01:01:4f:5d:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "24:fd:5b:00:01:01:4f:5d", "endpoint_id": 1, "available": true, @@ -331,22 +283,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "24:fd:5b:00:01:01:4f:5d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "24:fd:5b:00:01:01:4f:5d", "endpoint_id": 1, "available": true, @@ -375,22 +311,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "24:fd:5b:00:01:01:4f:5d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "24:fd:5b:00:01:01:4f:5d", "endpoint_id": 1, "available": true, @@ -419,22 +339,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "24:fd:5b:00:01:01:4f:5d:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "24:fd:5b:00:01:01:4f:5d", "endpoint_id": 1, "available": true, @@ -471,22 +375,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "24:fd:5b:00:01:01:4f:5d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "24:fd:5b:00:01:01:4f:5d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/smartwings-wm25-l-z.json b/tests/data/devices/smartwings-wm25-l-z.json index 5f6da8c0c..889a6ce8d 100644 --- a/tests/data/devices/smartwings-wm25-l-z.json +++ b/tests/data/devices/smartwings-wm25-l-z.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "e0:79:8d:ff:fe:be:fd:b9", "nwk": "0x0675", "manufacturer": "Smartwings", @@ -314,22 +314,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "e0:79:8d:ff:fe:be:fd:b9:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "e0:79:8d:ff:fe:be:fd:b9", "endpoint_id": 1, "available": true, @@ -362,22 +346,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "e0:79:8d:ff:fe:be:fd:b9:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "e0:79:8d:ff:fe:be:fd:b9", "endpoint_id": 1, "available": true, @@ -412,22 +380,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "e0:79:8d:ff:fe:be:fd:b9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "e0:79:8d:ff:fe:be:fd:b9", "endpoint_id": 1, "available": true, @@ -456,22 +408,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "e0:79:8d:ff:fe:be:fd:b9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "e0:79:8d:ff:fe:be:fd:b9", "endpoint_id": 1, "available": true, @@ -500,22 +436,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "e0:79:8d:ff:fe:be:fd:b9:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "e0:79:8d:ff:fe:be:fd:b9", "endpoint_id": 1, "available": true, @@ -550,22 +470,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "e0:79:8d:ff:fe:be:fd:b9:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "e0:79:8d:ff:fe:be:fd:b9", "endpoint_id": 1, "available": true, @@ -596,22 +500,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "e0:79:8d:ff:fe:be:fd:b9:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "e0:79:8d:ff:fe:be:fd:b9", "endpoint_id": 1, "available": true, @@ -646,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "e0:79:8d:ff:fe:be:fd:b9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "e0:79:8d:ff:fe:be:fd:b9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/somfy-situo-4-zigbee.json b/tests/data/devices/somfy-situo-4-zigbee.json index cbd7da704..cb6873594 100644 --- a/tests/data/devices/somfy-situo-4-zigbee.json +++ b/tests/data/devices/somfy-situo-4-zigbee.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:85:3b:98:5a", "nwk": "0xB743", "manufacturer": "SOMFY", @@ -445,22 +445,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:85:3b:98:5a:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:3b:98:5a", "endpoint_id": 1, "available": true, @@ -488,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "2:0x0006_client", - "unique_id": "ab:cd:ef:12:85:3b:98:5a:2:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:3b:98:5a", "endpoint_id": 2, "available": true, @@ -531,22 +499,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "3:0x0006_client", - "unique_id": "ab:cd:ef:12:85:3b:98:5a:3:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:3b:98:5a", "endpoint_id": 3, "available": true, @@ -574,22 +526,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "4:0x0006_client", - "unique_id": "ab:cd:ef:12:85:3b:98:5a:4:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:3b:98:5a", "endpoint_id": 4, "available": true, @@ -619,22 +555,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:85:3b:98:5a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:3b:98:5a", "endpoint_id": 1, "available": true, @@ -667,22 +587,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:3b:98:5a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:3b:98:5a", "endpoint_id": 1, "available": true, @@ -711,22 +615,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:3b:98:5a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:3b:98:5a", "endpoint_id": 1, "available": true, @@ -755,22 +643,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 232, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "232:0x0001", - "unique_id": "ab:cd:ef:12:85:3b:98:5a:232:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:85:3b:98:5a", "endpoint_id": 232, "available": true, @@ -806,22 +678,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 232, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "232:0x0019_client", - "unique_id": "ab:cd:ef:12:85:3b:98:5a:232:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:3b:98:5a", "endpoint_id": 232, "available": true, diff --git a/tests/data/devices/somfy-sonesse-28-wf-li-ion-roller.json b/tests/data/devices/somfy-sonesse-28-wf-li-ion-roller.json index 0b6e3f213..7b96dc427 100644 --- a/tests/data/devices/somfy-sonesse-28-wf-li-ion-roller.json +++ b/tests/data/devices/somfy-sonesse-28-wf-li-ion-roller.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7b:7c:3f:a7", "nwk": "0x3218", "manufacturer": "SOMFY", @@ -301,22 +301,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:7b:7c:3f:a7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:7c:3f:a7", "endpoint_id": 1, "available": true, @@ -349,22 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:7b:7c:3f:a7:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:7b:7c:3f:a7", "endpoint_id": 1, "available": true, @@ -399,22 +367,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:7c:3f:a7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:7c:3f:a7", "endpoint_id": 1, "available": true, @@ -443,22 +395,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:7c:3f:a7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:7c:3f:a7", "endpoint_id": 1, "available": true, @@ -487,22 +423,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:7b:7c:3f:a7:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:7b:7c:3f:a7", "endpoint_id": 1, "available": true, @@ -531,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 232, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "232:0x0001", - "unique_id": "ab:cd:ef:12:7b:7c:3f:a7:232:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:7b:7c:3f:a7", "endpoint_id": 232, "available": true, @@ -582,22 +486,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:7b:7c:3f:a7:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:7b:7c:3f:a7", "endpoint_id": 1, "available": true, @@ -632,22 +520,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 232, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "232:0x0019_client", - "unique_id": "ab:cd:ef:12:7b:7c:3f:a7:232:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:7c:3f:a7", "endpoint_id": 232, "available": true, diff --git a/tests/data/devices/somfy-ysia-5-hp-zigbee.json b/tests/data/devices/somfy-ysia-5-hp-zigbee.json index 36eda2b48..fd9c5d086 100644 --- a/tests/data/devices/somfy-ysia-5-hp-zigbee.json +++ b/tests/data/devices/somfy-ysia-5-hp-zigbee.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:05:26:2e:c9", "nwk": "0xD882", "manufacturer": "SOMFY", @@ -672,22 +672,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:05:26:2e:c9:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:26:2e:c9", "endpoint_id": 1, "available": true, @@ -715,22 +699,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "2:0x0006_client", - "unique_id": "ab:cd:ef:12:05:26:2e:c9:2:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:26:2e:c9", "endpoint_id": 2, "available": true, @@ -758,22 +726,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "3:0x0006_client", - "unique_id": "ab:cd:ef:12:05:26:2e:c9:3:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:26:2e:c9", "endpoint_id": 3, "available": true, @@ -801,22 +753,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "4:0x0006_client", - "unique_id": "ab:cd:ef:12:05:26:2e:c9:4:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:26:2e:c9", "endpoint_id": 4, "available": true, @@ -844,22 +780,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 5, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "5:0x0006_client", - "unique_id": "ab:cd:ef:12:05:26:2e:c9:5:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:26:2e:c9", "endpoint_id": 5, "available": true, @@ -889,22 +809,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:05:26:2e:c9:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:26:2e:c9", "endpoint_id": 1, "available": true, @@ -937,22 +841,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:05:26:2e:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:26:2e:c9", "endpoint_id": 1, "available": true, @@ -981,22 +869,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:05:26:2e:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:26:2e:c9", "endpoint_id": 1, "available": true, @@ -1025,22 +897,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 232, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "232:0x0001", - "unique_id": "ab:cd:ef:12:05:26:2e:c9:232:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:05:26:2e:c9", "endpoint_id": 232, "available": true, @@ -1076,22 +932,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 232, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "232:0x0019_client", - "unique_id": "ab:cd:ef:12:05:26:2e:c9:232:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:26:2e:c9", "endpoint_id": 232, "available": true, diff --git a/tests/data/devices/sonoff-01minizb.json b/tests/data/devices/sonoff-01minizb.json index d0b082a5d..28bda0e60 100644 --- a/tests/data/devices/sonoff-01minizb.json +++ b/tests/data/devices/sonoff-01minizb.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:12:4b:00:26:b7:de:4f", "nwk": "0x8893", "manufacturer": "SONOFF", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:12:4b:00:26:b7:de:4f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:26:b7:de:4f", "endpoint_id": 1, "available": true, @@ -231,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:12:4b:00:26:b7:de:4f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:12:4b:00:26:b7:de:4f", "endpoint_id": 1, "available": true, @@ -299,22 +267,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:26:b7:de:4f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:26:b7:de:4f", "endpoint_id": 1, "available": true, @@ -343,22 +295,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:26:b7:de:4f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:26:b7:de:4f", "endpoint_id": 1, "available": true, @@ -389,22 +325,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:12:4b:00:26:b7:de:4f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:26:b7:de:4f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-basiczbr3.json b/tests/data/devices/sonoff-basiczbr3.json index 7ba5a7486..3604ad0cf 100644 --- a/tests/data/devices/sonoff-basiczbr3.json +++ b/tests/data/devices/sonoff-basiczbr3.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:93:ca:86:ba", "nwk": "0x1CDA", "manufacturer": "SONOFF", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:93:ca:86:ba:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:ca:86:ba", "endpoint_id": 1, "available": true, @@ -202,22 +186,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:93:ca:86:ba:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:93:ca:86:ba", "endpoint_id": 1, "available": true, @@ -270,22 +238,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:93:ca:86:ba:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:ca:86:ba", "endpoint_id": 1, "available": true, @@ -314,22 +266,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:93:ca:86:ba:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:ca:86:ba", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-dongle-e-r.json b/tests/data/devices/sonoff-dongle-e-r.json index 468ed562e..a3a6e4fed 100644 --- a/tests/data/devices/sonoff-dongle-e-r.json +++ b/tests/data/devices/sonoff-dongle-e-r.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:33:57:93:05", "nwk": "0xCD22", "manufacturer": "SONOFF", @@ -400,22 +400,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:33:57:93:05:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:57:93:05", "endpoint_id": 1, "available": true, @@ -448,36 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:33:57:93:05:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:33:57:93:05:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:33:57:93:05", "endpoint_id": 1, "available": true, @@ -529,50 +483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:33:57:93:05:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 2, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "2:0x0008", - "unique_id": "ab:cd:ef:12:33:57:93:05:2:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 2, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "2:0x0300", - "unique_id": "ab:cd:ef:12:33:57:93:05:2:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:33:57:93:05", "endpoint_id": 2, "available": true, @@ -627,22 +537,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:33:57:93:05:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:33:57:93:05", "endpoint_id": 1, "available": true, @@ -674,22 +568,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 2, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "2:0x0300", - "unique_id": "ab:cd:ef:12:33:57:93:05:2:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:33:57:93:05", "endpoint_id": 2, "available": true, @@ -721,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 2, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "2:0x0008", - "unique_id": "ab:cd:ef:12:33:57:93:05:2:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:33:57:93:05", "endpoint_id": 2, "available": true, @@ -770,22 +632,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:33:57:93:05:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:33:57:93:05", "endpoint_id": 1, "available": true, @@ -819,22 +665,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:33:57:93:05:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:33:57:93:05", "endpoint_id": 2, "available": true, @@ -870,22 +700,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:33:57:93:05:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:57:93:05", "endpoint_id": 1, "available": true, @@ -914,22 +728,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:33:57:93:05:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:57:93:05", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-mini-zbdim.json b/tests/data/devices/sonoff-mini-zbdim.json index dc1882129..c9f6bcd3c 100644 --- a/tests/data/devices/sonoff-mini-zbdim.json +++ b/tests/data/devices/sonoff-mini-zbdim.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ca:01:81:4d", "nwk": "0x1DEF", "manufacturer": "SONOFF", @@ -528,22 +528,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ca:01:81:4d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:01:81:4d", "endpoint_id": 1, "available": true, @@ -576,36 +560,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ca:01:81:4d:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ca:01:81:4d:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ca:01:81:4d", "endpoint_id": 1, "available": true, @@ -659,22 +613,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ca:01:81:4d:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ca:01:81:4d", "endpoint_id": 1, "available": true, @@ -710,22 +648,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ca:01:81:4d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:01:81:4d", "endpoint_id": 1, "available": true, @@ -754,22 +676,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ca:01:81:4d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:01:81:4d", "endpoint_id": 1, "available": true, @@ -789,7 +695,7 @@ "unique_id": "ab:cd:ef:12:ca:01:81:4d-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -798,22 +704,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ca:01:81:4d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ca:01:81:4d", "endpoint_id": 1, "available": true, @@ -822,7 +712,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -847,22 +737,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ca:01:81:4d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ca:01:81:4d", "endpoint_id": 1, "available": true, @@ -896,22 +770,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ca:01:81:4d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ca:01:81:4d", "endpoint_id": 1, "available": true, @@ -947,22 +805,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ca:01:81:4d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:01:81:4d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-mini-zbrbs.json b/tests/data/devices/sonoff-mini-zbrbs.json index fbae1b1af..8b6b29f5a 100644 --- a/tests/data/devices/sonoff-mini-zbrbs.json +++ b/tests/data/devices/sonoff-mini-zbrbs.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a2:24:57:22", "nwk": "0x3839", "manufacturer": "SONOFF", @@ -294,22 +294,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:a2:24:57:22:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:24:57:22", "endpoint_id": 1, "available": true, @@ -340,22 +324,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "SonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:a2:24:57:22:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:24:57:22", "endpoint_id": 1, "available": true, @@ -385,22 +353,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:a2:24:57:22:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:a2:24:57:22", "endpoint_id": 1, "available": true, @@ -435,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "SonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:a2:24:57:22:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:24:57:22", "endpoint_id": 1, "available": true, @@ -484,22 +420,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:24:57:22:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:24:57:22", "endpoint_id": 1, "available": true, @@ -528,22 +448,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:24:57:22:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:24:57:22", "endpoint_id": 1, "available": true, @@ -572,22 +476,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:a2:24:57:22:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:a2:24:57:22", "endpoint_id": 1, "available": true, @@ -616,22 +504,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "SonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:a2:24:57:22:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:24:57:22", "endpoint_id": 1, "available": true, @@ -660,22 +532,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "SonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:a2:24:57:22:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:24:57:22", "endpoint_id": 1, "available": true, @@ -706,22 +562,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:a2:24:57:22:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:a2:24:57:22", "endpoint_id": 1, "available": true, @@ -756,22 +596,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a2:24:57:22:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:24:57:22", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-s26r2zb.json b/tests/data/devices/sonoff-s26r2zb.json index acdea9e75..31d419c53 100644 --- a/tests/data/devices/sonoff-s26r2zb.json +++ b/tests/data/devices/sonoff-s26r2zb.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b4:e4:bd:45", "nwk": "0xFF60", "manufacturer": "SONOFF", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:b4:e4:bd:45:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b4:e4:bd:45", "endpoint_id": 1, "available": true, @@ -269,22 +253,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b4:e4:bd:45:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b4:e4:bd:45", "endpoint_id": 1, "available": true, @@ -313,22 +281,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b4:e4:bd:45:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b4:e4:bd:45", "endpoint_id": 1, "available": true, @@ -359,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:b4:e4:bd:45:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b4:e4:bd:45", "endpoint_id": 1, "available": true, @@ -403,22 +339,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b4:e4:bd:45:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b4:e4:bd:45", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-s31-lite-zb.json b/tests/data/devices/sonoff-s31-lite-zb.json index 5f945cdf0..220fe62a3 100644 --- a/tests/data/devices/sonoff-s31-lite-zb.json +++ b/tests/data/devices/sonoff-s31-lite-zb.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:12:4b:00:24:56:cb:dc", "nwk": "0xF7AE", "manufacturer": "SONOFF", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:12:4b:00:24:56:cb:dc:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:24:56:cb:dc", "endpoint_id": 1, "available": true, @@ -202,22 +186,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:24:56:cb:dc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:24:56:cb:dc", "endpoint_id": 1, "available": true, @@ -246,22 +214,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:12:4b:00:24:56:cb:dc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:24:56:cb:dc", "endpoint_id": 1, "available": true, @@ -292,22 +244,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "00:12:4b:00:24:56:cb:dc:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "00:12:4b:00:24:56:cb:dc", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-s60zbtpg.json b/tests/data/devices/sonoff-s60zbtpg.json index e7589ff31..bd5e21d88 100644 --- a/tests/data/devices/sonoff-s60zbtpg.json +++ b/tests/data/devices/sonoff-s60zbtpg.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:0b:76:b6:2c", "nwk": "0xD301", "manufacturer": "SONOFF", @@ -534,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:0b:76:b6:2c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0b:76:b6:2c", "endpoint_id": 1, "available": true, @@ -582,22 +566,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:0b:76:b6:2c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0b:76:b6:2c", "endpoint_id": 1, "available": true, @@ -633,22 +601,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0b:76:b6:2c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0b:76:b6:2c", "endpoint_id": 1, "available": true, @@ -677,22 +629,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0b:76:b6:2c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0b:76:b6:2c", "endpoint_id": 1, "available": true, @@ -721,22 +657,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:0b:76:b6:2c:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:0b:76:b6:2c", "endpoint_id": 1, "available": true, @@ -764,7 +684,7 @@ "unique_id": "ab:cd:ef:12:0b:76:b6:2c-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -773,22 +693,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:0b:76:b6:2c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:0b:76:b6:2c", "endpoint_id": 1, "available": true, @@ -797,7 +701,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 11.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -822,22 +726,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:0b:76:b6:2c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:0b:76:b6:2c", "endpoint_id": 1, "available": true, @@ -871,22 +759,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:0b:76:b6:2c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:0b:76:b6:2c", "endpoint_id": 1, "available": true, @@ -922,22 +794,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:0b:76:b6:2c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0b:76:b6:2c", "endpoint_id": 1, "available": true, @@ -966,22 +822,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:0b:76:b6:2c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0b:76:b6:2c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-snzb-01m.json b/tests/data/devices/sonoff-snzb-01m.json index fcf3aceb2..d1ce35a0b 100644 --- a/tests/data/devices/sonoff-snzb-01m.json +++ b/tests/data/devices/sonoff-snzb-01m.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:25:6d:54:c8", "nwk": "0x0A82", "manufacturer": "SONOFF", @@ -316,22 +316,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:25:6d:54:c8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:6d:54:c8", "endpoint_id": 1, "available": true, @@ -364,22 +348,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:25:6d:54:c8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:6d:54:c8", "endpoint_id": 1, "available": true, @@ -408,22 +376,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:25:6d:54:c8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:6d:54:c8", "endpoint_id": 1, "available": true, @@ -452,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:25:6d:54:c8:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:25:6d:54:c8", "endpoint_id": 1, "available": true, @@ -503,22 +439,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:25:6d:54:c8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:6d:54:c8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-snzb-02d.json b/tests/data/devices/sonoff-snzb-02d.json index 054310d6e..65d3349f4 100644 --- a/tests/data/devices/sonoff-snzb-02d.json +++ b/tests/data/devices/sonoff-snzb-02d.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e3:70:52:f5", "nwk": "0x11FE", "manufacturer": "SONOFF", @@ -225,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -273,22 +257,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -320,22 +288,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -367,22 +319,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -414,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -461,22 +381,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -508,22 +412,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -557,22 +445,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -606,22 +478,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -650,22 +506,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -694,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -743,22 +567,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -787,22 +595,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, @@ -833,22 +625,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e3:70:52:f5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:70:52:f5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-snzb-04pr2.json b/tests/data/devices/sonoff-snzb-04pr2.json index 186817f7f..6a287bb06 100644 --- a/tests/data/devices/sonoff-snzb-04pr2.json +++ b/tests/data/devices/sonoff-snzb-04pr2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f7:3c:1f:0d", "nwk": "0x6BB3", "manufacturer": "SONOFF", @@ -202,22 +202,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:f7:3c:1f:0d:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:3c:1f:0d", "endpoint_id": 1, "available": true, @@ -247,22 +231,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f7:3c:1f:0d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:3c:1f:0d", "endpoint_id": 1, "available": true, @@ -295,22 +263,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f7:3c:1f:0d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:3c:1f:0d", "endpoint_id": 1, "available": true, @@ -339,22 +291,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f7:3c:1f:0d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:3c:1f:0d", "endpoint_id": 1, "available": true, @@ -383,22 +319,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:f7:3c:1f:0d:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:f7:3c:1f:0d", "endpoint_id": 1, "available": true, @@ -434,22 +354,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f7:3c:1f:0d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:3c:1f:0d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-snzb-05p.json b/tests/data/devices/sonoff-snzb-05p.json index 05282e44f..25d23ced3 100644 --- a/tests/data/devices/sonoff-snzb-05p.json +++ b/tests/data/devices/sonoff-snzb-05p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:94:50:f5:8b", "nwk": "0xBA7E", "manufacturer": "SONOFF", @@ -226,22 +226,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:94:50:f5:8b:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:50:f5:8b", "endpoint_id": 1, "available": true, @@ -271,22 +255,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:94:50:f5:8b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:50:f5:8b", "endpoint_id": 1, "available": true, @@ -319,22 +287,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:94:50:f5:8b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:50:f5:8b", "endpoint_id": 1, "available": true, @@ -363,22 +315,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:94:50:f5:8b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:50:f5:8b", "endpoint_id": 1, "available": true, @@ -407,22 +343,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:94:50:f5:8b:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:94:50:f5:8b", "endpoint_id": 1, "available": true, @@ -459,22 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:94:50:f5:8b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:50:f5:8b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-snzb-06p.json b/tests/data/devices/sonoff-snzb-06p.json index 52bb72aa0..95cc11d95 100644 --- a/tests/data/devices/sonoff-snzb-06p.json +++ b/tests/data/devices/sonoff-snzb-06p.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:dd:23:ca:15", "nwk": "0xB334", "manufacturer": "SONOFF", @@ -181,22 +181,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:dd:23:ca:15:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:dd:23:ca:15", "endpoint_id": 1, "available": true, @@ -226,22 +210,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:dd:23:ca:15:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dd:23:ca:15", "endpoint_id": 1, "available": true, @@ -274,22 +242,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:dd:23:ca:15:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:dd:23:ca:15", "endpoint_id": 1, "available": true, @@ -323,22 +275,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:dd:23:ca:15:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:dd:23:ca:15", "endpoint_id": 1, "available": true, @@ -373,22 +309,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:dd:23:ca:15:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dd:23:ca:15", "endpoint_id": 1, "available": true, @@ -417,22 +337,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:dd:23:ca:15:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dd:23:ca:15", "endpoint_id": 1, "available": true, @@ -461,22 +365,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "SonoffFC11Cluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:dd:23:ca:15:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dd:23:ca:15", "endpoint_id": 1, "available": true, @@ -507,22 +395,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:dd:23:ca:15:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dd:23:ca:15", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-swv.json b/tests/data/devices/sonoff-swv.json index 54e77bfa5..4d798b766 100644 --- a/tests/data/devices/sonoff-swv.json +++ b/tests/data/devices/sonoff-swv.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8c:25:a4:7c", "nwk": "0x11B6", "manufacturer": "SONOFF", @@ -440,22 +440,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:8c:25:a4:7c:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:25:a4:7c", "endpoint_id": 1, "available": true, @@ -483,22 +467,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:8c:25:a4:7c:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:25:a4:7c", "endpoint_id": 1, "available": true, @@ -528,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:8c:25:a4:7c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:25:a4:7c", "endpoint_id": 1, "available": true, @@ -576,22 +528,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8c:25:a4:7c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:25:a4:7c", "endpoint_id": 1, "available": true, @@ -620,22 +556,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8c:25:a4:7c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:25:a4:7c", "endpoint_id": 1, "available": true, @@ -664,22 +584,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:8c:25:a4:7c:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:8c:25:a4:7c", "endpoint_id": 1, "available": true, @@ -714,22 +618,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "FlowMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0404", - "endpoint_id": 1, - "cluster": { - "id": 1028, - "name": "Flow Measurement", - "type": "server" - }, - "id": "1:0x0404", - "unique_id": "ab:cd:ef:12:8c:25:a4:7c:1:0x0404", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:8c:25:a4:7c", "endpoint_id": 1, "available": true, @@ -760,22 +648,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:8c:25:a4:7c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:8c:25:a4:7c", "endpoint_id": 1, "available": true, @@ -802,22 +674,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:8c:25:a4:7c:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:25:a4:7c", "endpoint_id": 1, "available": true, @@ -852,22 +708,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8c:25:a4:7c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:25:a4:7c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-trvzb.json b/tests/data/devices/sonoff-trvzb.json index b332044fc..c69128663 100644 --- a/tests/data/devices/sonoff-trvzb.json +++ b/tests/data/devices/sonoff-trvzb.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4d:04:9a:8f", "nwk": "0x91D0", "manufacturer": "SONOFF", @@ -387,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -433,22 +417,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -476,22 +444,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -521,22 +473,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -600,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -647,22 +567,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -694,22 +598,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -741,22 +629,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -788,22 +660,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -835,22 +691,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -882,22 +722,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -929,22 +753,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -976,22 +784,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1023,22 +815,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1072,22 +848,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1116,22 +876,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1160,22 +904,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1209,22 +937,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1253,22 +965,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1299,22 +995,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1341,22 +1021,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1389,22 +1053,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1437,22 +1085,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1485,22 +1117,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "CustomSonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, @@ -1535,22 +1151,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:4d:04:9a:8f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4d:04:9a:8f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-zbmicro.json b/tests/data/devices/sonoff-zbmicro.json index 0541c6f8b..024eca25c 100644 --- a/tests/data/devices/sonoff-zbmicro.json +++ b/tests/data/devices/sonoff-zbmicro.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "8c:65:a3:ff:fe:54:87:a0", "nwk": "0xDF24", "manufacturer": "SONOFF", @@ -190,22 +190,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "8c:65:a3:ff:fe:54:87:a0:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "8c:65:a3:ff:fe:54:87:a0", "endpoint_id": 1, "available": true, @@ -238,22 +222,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "8c:65:a3:ff:fe:54:87:a0:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "8c:65:a3:ff:fe:54:87:a0", "endpoint_id": 1, "available": true, @@ -289,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "8c:65:a3:ff:fe:54:87:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "8c:65:a3:ff:fe:54:87:a0", "endpoint_id": 1, "available": true, @@ -333,22 +285,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "8c:65:a3:ff:fe:54:87:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "8c:65:a3:ff:fe:54:87:a0", "endpoint_id": 1, "available": true, @@ -379,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "8c:65:a3:ff:fe:54:87:a0:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "8c:65:a3:ff:fe:54:87:a0", "endpoint_id": 1, "available": true, @@ -423,22 +343,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "8c:65:a3:ff:fe:54:87:a0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "8c:65:a3:ff:fe:54:87:a0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-zbminil2.json b/tests/data/devices/sonoff-zbminil2.json index 66b8f16b8..db32f87ca 100644 --- a/tests/data/devices/sonoff-zbminil2.json +++ b/tests/data/devices/sonoff-zbminil2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d4:86:60:40", "nwk": "0x1FC6", "manufacturer": "SONOFF", @@ -198,22 +198,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d4:86:60:40:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:86:60:40", "endpoint_id": 1, "available": true, @@ -246,22 +230,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d4:86:60:40:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:d4:86:60:40", "endpoint_id": 1, "available": true, @@ -297,22 +265,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d4:86:60:40:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:86:60:40", "endpoint_id": 1, "available": true, @@ -341,22 +293,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d4:86:60:40:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:86:60:40", "endpoint_id": 1, "available": true, @@ -385,22 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:d4:86:60:40:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:d4:86:60:40", "endpoint_id": 1, "available": true, @@ -436,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d4:86:60:40:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:d4:86:60:40", "endpoint_id": 1, "available": true, @@ -480,22 +384,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d4:86:60:40:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:86:60:40", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sonoff-zbminir2.json b/tests/data/devices/sonoff-zbminir2.json index a445333b6..cebd6856f 100644 --- a/tests/data/devices/sonoff-zbminir2.json +++ b/tests/data/devices/sonoff-zbminir2.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f5:dc:76:8d", "nwk": "0x553F", "manufacturer": "SONOFF", @@ -300,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:f5:dc:76:8d:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:dc:76:8d", "endpoint_id": 1, "available": true, @@ -345,22 +329,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f5:dc:76:8d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:dc:76:8d", "endpoint_id": 1, "available": true, @@ -393,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:f5:dc:76:8d:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f5:dc:76:8d", "endpoint_id": 1, "available": true, @@ -442,22 +394,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "SonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:f5:dc:76:8d:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:dc:76:8d", "endpoint_id": 1, "available": true, @@ -493,22 +429,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f5:dc:76:8d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:dc:76:8d", "endpoint_id": 1, "available": true, @@ -537,22 +457,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f5:dc:76:8d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:dc:76:8d", "endpoint_id": 1, "available": true, @@ -583,22 +487,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:f5:dc:76:8d:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f5:dc:76:8d", "endpoint_id": 1, "available": true, @@ -625,22 +513,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "SonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:f5:dc:76:8d:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:dc:76:8d", "endpoint_id": 1, "available": true, @@ -673,22 +545,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "SonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:f5:dc:76:8d:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:dc:76:8d", "endpoint_id": 1, "available": true, @@ -721,22 +577,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SonoffPresenceSenorClusterHandler", - "generic_id": "cluster_handler_0xfc11", - "endpoint_id": 1, - "cluster": { - "id": 64529, - "name": "SonoffCluster", - "type": "server" - }, - "id": "1:0xfc11", - "unique_id": "ab:cd:ef:12:f5:dc:76:8d:1:0xfc11", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:dc:76:8d", "endpoint_id": 1, "available": true, @@ -771,22 +611,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f5:dc:76:8d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:dc:76:8d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sunricher-hk-dim.json b/tests/data/devices/sunricher-hk-dim.json index 565aaa65d..62ceb22fb 100644 --- a/tests/data/devices/sunricher-hk-dim.json +++ b/tests/data/devices/sunricher-hk-dim.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:55:c3:5a:e0", "nwk": "0x8333", "manufacturer": "Sunricher", @@ -676,22 +676,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 1, "available": true, @@ -719,22 +703,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 2, "available": true, @@ -764,22 +732,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 1, "available": true, @@ -812,36 +764,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 1, "available": true, @@ -895,22 +817,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 1, "available": true, @@ -942,22 +848,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 1, "available": true, @@ -989,22 +879,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 1, "available": true, @@ -1036,22 +910,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 2, "available": true, @@ -1083,22 +941,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 2, "available": true, @@ -1132,22 +974,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 1, "available": true, @@ -1183,22 +1009,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 1, "available": true, @@ -1227,22 +1037,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 1, "available": true, @@ -1271,22 +1065,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 3, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "3:0x0400", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:3:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 3, "available": true, @@ -1317,22 +1095,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:55:c3:5a:e0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:c3:5a:e0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sunricher-hk-ln-dim-a.json b/tests/data/devices/sunricher-hk-ln-dim-a.json index d4d7d5eb1..fb6c6a70c 100644 --- a/tests/data/devices/sunricher-hk-ln-dim-a.json +++ b/tests/data/devices/sunricher-hk-ln-dim-a.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "b4:35:22:ff:fe:6a:5e:6a", "nwk": "0x6CC7", "manufacturer": "Sunricher", @@ -271,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "b4:35:22:ff:fe:6a:5e:6a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b4:35:22:ff:fe:6a:5e:6a", "endpoint_id": 1, "available": true, @@ -319,36 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b4:35:22:ff:fe:6a:5e:6a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b4:35:22:ff:fe:6a:5e:6a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b4:35:22:ff:fe:6a:5e:6a", "endpoint_id": 1, "available": true, @@ -402,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b4:35:22:ff:fe:6a:5e:6a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b4:35:22:ff:fe:6a:5e:6a", "endpoint_id": 1, "available": true, @@ -449,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b4:35:22:ff:fe:6a:5e:6a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b4:35:22:ff:fe:6a:5e:6a", "endpoint_id": 1, "available": true, @@ -496,22 +418,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b4:35:22:ff:fe:6a:5e:6a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b4:35:22:ff:fe:6a:5e:6a", "endpoint_id": 1, "available": true, @@ -545,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b4:35:22:ff:fe:6a:5e:6a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "b4:35:22:ff:fe:6a:5e:6a", "endpoint_id": 1, "available": true, @@ -596,22 +486,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b4:35:22:ff:fe:6a:5e:6a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b4:35:22:ff:fe:6a:5e:6a", "endpoint_id": 1, "available": true, @@ -640,22 +514,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b4:35:22:ff:fe:6a:5e:6a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b4:35:22:ff:fe:6a:5e:6a", "endpoint_id": 1, "available": true, @@ -686,22 +544,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "b4:35:22:ff:fe:6a:5e:6a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b4:35:22:ff:fe:6a:5e:6a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/sunricher-on-off-2ch.json b/tests/data/devices/sunricher-on-off-2ch.json index cf10a4bd0..14d33934f 100644 --- a/tests/data/devices/sunricher-on-off-2ch.json +++ b/tests/data/devices/sunricher-on-off-2ch.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:98:6b:31:c6", "nwk": "0x2ACF", "manufacturer": "Sunricher", @@ -655,22 +655,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 1, "available": true, @@ -703,22 +687,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 1, "available": true, @@ -769,22 +737,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 2, "available": true, @@ -837,22 +789,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 1, "available": true, @@ -886,22 +822,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 2, "available": true, @@ -937,22 +857,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 1, "available": true, @@ -981,22 +885,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 1, "available": true, @@ -1025,22 +913,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 11, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "11:0x0702", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:11:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 11, "available": true, @@ -1068,7 +940,7 @@ "unique_id": "ab:cd:ef:12:98:6b:31:c6-11-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1077,22 +949,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 11, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "11:0x0b04", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:11:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 11, "available": true, @@ -1101,7 +957,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -1126,22 +982,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 11, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "11:0x0b04", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:11:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 11, "available": true, @@ -1175,22 +1015,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 11, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "11:0x0b04", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:11:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 11, "available": true, @@ -1224,22 +1048,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 11, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "11:0x0b04", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:11:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 11, "available": true, @@ -1275,22 +1083,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 11, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "11:0x0019_client", - "unique_id": "ab:cd:ef:12:98:6b:31:c6:11:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:6b:31:c6", "endpoint_id": 11, "available": true, diff --git a/tests/data/devices/texas-instruments-cc2652.json b/tests/data/devices/texas-instruments-cc2652.json index 2a67eeb33..672d0a3ed 100644 --- a/tests/data/devices/texas-instruments-cc2652.json +++ b/tests/data/devices/texas-instruments-cc2652.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6a:30:e1:65", "nwk": "0xFF51", "manufacturer": "Texas Instruments", diff --git a/tests/data/devices/texas-instruments-coordinator.json b/tests/data/devices/texas-instruments-coordinator.json index 43e0849c0..ced7e6826 100644 --- a/tests/data/devices/texas-instruments-coordinator.json +++ b/tests/data/devices/texas-instruments-coordinator.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:14:1a:f0:68", "nwk": "0x0000", "manufacturer": "Texas Instruments", diff --git a/tests/data/devices/texasinstruments-ti-router.json b/tests/data/devices/texasinstruments-ti-router.json index 0d70d7312..c79a343c1 100644 --- a/tests/data/devices/texasinstruments-ti-router.json +++ b/tests/data/devices/texasinstruments-ti-router.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:12:4b:00:21:b4:96:29", "nwk": "0x4523", "manufacturer": "TexasInstruments", @@ -152,22 +152,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 8, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "8:0x0003", - "unique_id": "00:12:4b:00:21:b4:96:29:8:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:21:b4:96:29", "endpoint_id": 8, "available": true, @@ -200,22 +184,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 8, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "8:0x0000", - "unique_id": "00:12:4b:00:21:b4:96:29:8:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:21:b4:96:29", "endpoint_id": 8, "available": true, @@ -249,22 +217,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 8, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "8:0x0000", - "unique_id": "00:12:4b:00:21:b4:96:29:8:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:21:b4:96:29", "endpoint_id": 8, "available": true, @@ -293,22 +245,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 8, - "cluster": { - "id": 0, - "name": "BasicCluster", - "type": "server" - }, - "id": "8:0x0000", - "unique_id": "00:12:4b:00:21:b4:96:29:8:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:21:b4:96:29", "endpoint_id": 8, "available": true, diff --git a/tests/data/devices/the-home-depot-ecosmart-zbt-a19-cct-bulb.json b/tests/data/devices/the-home-depot-ecosmart-zbt-a19-cct-bulb.json index f77da11c3..e0eb5e47b 100644 --- a/tests/data/devices/the-home-depot-ecosmart-zbt-a19-cct-bulb.json +++ b/tests/data/devices/the-home-depot-ecosmart-zbt-a19-cct-bulb.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ec:1b:bd:ff:fe:32:46:39", "nwk": "0x0A42", "manufacturer": "The Home Depot", @@ -366,22 +366,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:32:46:39", "endpoint_id": 1, "available": true, @@ -414,50 +398,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ec:1b:bd:ff:fe:32:46:39", "endpoint_id": 1, "available": true, @@ -512,22 +452,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ec:1b:bd:ff:fe:32:46:39", "endpoint_id": 1, "available": true, @@ -559,22 +483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ec:1b:bd:ff:fe:32:46:39", "endpoint_id": 1, "available": true, @@ -606,22 +514,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ec:1b:bd:ff:fe:32:46:39", "endpoint_id": 1, "available": true, @@ -653,22 +545,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ec:1b:bd:ff:fe:32:46:39", "endpoint_id": 1, "available": true, @@ -702,22 +578,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ec:1b:bd:ff:fe:32:46:39", "endpoint_id": 1, "available": true, @@ -753,22 +613,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:32:46:39", "endpoint_id": 1, "available": true, @@ -797,22 +641,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:32:46:39", "endpoint_id": 1, "available": true, @@ -843,22 +671,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ec:1b:bd:ff:fe:32:46:39:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:32:46:39", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rap0149bz.json b/tests/data/devices/third-reality-inc-3rap0149bz.json index 03ef2ecc8..de064bd93 100644 --- a/tests/data/devices/third-reality-inc-3rap0149bz.json +++ b/tests/data/devices/third-reality-inc-3rap0149bz.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6f:2f:02:92", "nwk": "0x173B", "manufacturer": "Third Reality, Inc", @@ -235,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:6f:2f:02:92:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:2f:02:92", "endpoint_id": 1, "available": true, @@ -283,22 +267,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6f:2f:02:92:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:2f:02:92", "endpoint_id": 1, "available": true, @@ -327,22 +295,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6f:2f:02:92:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:2f:02:92", "endpoint_id": 1, "available": true, @@ -371,22 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:6f:2f:02:92:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:6f:2f:02:92", "endpoint_id": 1, "available": true, @@ -421,22 +357,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "PressureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0403", - "endpoint_id": 1, - "cluster": { - "id": 1027, - "name": "Pressure Measurement", - "type": "server" - }, - "id": "1:0x0403", - "unique_id": "ab:cd:ef:12:6f:2f:02:92:1:0x0403", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:6f:2f:02:92", "endpoint_id": 1, "available": true, @@ -465,22 +385,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogInputClusterHandler", - "generic_id": "cluster_handler_0x000c", - "endpoint_id": 1, - "cluster": { - "id": 12, - "name": "AnalogInput", - "type": "server" - }, - "id": "1:0x000c", - "unique_id": "ab:cd:ef:12:6f:2f:02:92:1:0x000c", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:6f:2f:02:92", "endpoint_id": 1, "available": true, @@ -511,22 +415,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6f:2f:02:92:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:2f:02:92", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rds17bz.json b/tests/data/devices/third-reality-inc-3rds17bz.json index 7f1695b8c..ef0f24081 100644 --- a/tests/data/devices/third-reality-inc-3rds17bz.json +++ b/tests/data/devices/third-reality-inc-3rds17bz.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:2c:02:bf:ff:e7:b2:eb", "nwk": "0xCA1A", "manufacturer": "Third Reality, Inc", @@ -194,22 +194,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "28:2c:02:bf:ff:e7:b2:eb:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:b2:eb", "endpoint_id": 1, "available": true, @@ -239,22 +223,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff01", - "endpoint_id": 1, - "cluster": { - "id": 65281, - "name": "ThirdRealityDoorCluster", - "type": "server" - }, - "id": "1:0xff01", - "unique_id": "28:2c:02:bf:ff:e7:b2:eb:1:0xff01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:b2:eb", "endpoint_id": 1, "available": true, @@ -288,22 +256,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e7:b2:eb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:b2:eb", "endpoint_id": 1, "available": true, @@ -332,22 +284,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e7:b2:eb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:b2:eb", "endpoint_id": 1, "available": true, @@ -376,22 +312,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "28:2c:02:bf:ff:e7:b2:eb:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "28:2c:02:bf:ff:e7:b2:eb", "endpoint_id": 1, "available": true, @@ -428,22 +348,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:2c:02:bf:ff:e7:b2:eb:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:b2:eb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rms16bz.json b/tests/data/devices/third-reality-inc-3rms16bz.json index 14ff72b44..93cc0a3cd 100644 --- a/tests/data/devices/third-reality-inc-3rms16bz.json +++ b/tests/data/devices/third-reality-inc-3rms16bz.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:2c:02:bf:ff:e7:ba:8c", "nwk": "0xED4B", "manufacturer": "Third Reality, Inc", @@ -220,22 +220,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "28:2c:02:bf:ff:e7:ba:8c:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:ba:8c", "endpoint_id": 1, "available": true, @@ -265,22 +249,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff01", - "endpoint_id": 1, - "cluster": { - "id": 65281, - "name": "ThirdRealityMotionCluster", - "type": "server" - }, - "id": "1:0xff01", - "unique_id": "28:2c:02:bf:ff:e7:ba:8c:1:0xff01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:ba:8c", "endpoint_id": 1, "available": true, @@ -314,22 +282,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e7:ba:8c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:ba:8c", "endpoint_id": 1, "available": true, @@ -358,22 +310,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e7:ba:8c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:ba:8c", "endpoint_id": 1, "available": true, @@ -402,22 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "28:2c:02:bf:ff:e7:ba:8c:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "28:2c:02:bf:ff:e7:ba:8c", "endpoint_id": 1, "available": true, @@ -454,22 +374,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:2c:02:bf:ff:e7:ba:8c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:ba:8c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rsb015bz.json b/tests/data/devices/third-reality-inc-3rsb015bz.json index da9b86d45..0ec380b5b 100644 --- a/tests/data/devices/third-reality-inc-3rsb015bz.json +++ b/tests/data/devices/third-reality-inc-3rsb015bz.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:2c:02:bf:ff:ea:05:68", "nwk": "0x12D8", "manufacturer": "Third Reality, Inc", @@ -326,22 +326,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "28:2c:02:bf:ff:ea:05:68:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:ea:05:68", "endpoint_id": 1, "available": true, @@ -371,22 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfff1", - "endpoint_id": 1, - "cluster": { - "id": 65521, - "name": "ThirdRealityCurtainCluster", - "type": "server" - }, - "id": "1:0xfff1", - "unique_id": "28:2c:02:bf:ff:ea:05:68:1:0xfff1", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:ea:05:68", "endpoint_id": 1, "available": true, @@ -416,22 +384,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "28:2c:02:bf:ff:ea:05:68:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "28:2c:02:bf:ff:ea:05:68", "endpoint_id": 1, "available": true, @@ -466,22 +418,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:ea:05:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:ea:05:68", "endpoint_id": 1, "available": true, @@ -510,22 +446,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:ea:05:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:ea:05:68", "endpoint_id": 1, "available": true, @@ -554,22 +474,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "28:2c:02:bf:ff:ea:05:68:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "28:2c:02:bf:ff:ea:05:68", "endpoint_id": 1, "available": true, @@ -604,22 +508,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "28:2c:02:bf:ff:ea:05:68:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "28:2c:02:bf:ff:ea:05:68", "endpoint_id": 1, "available": true, @@ -650,22 +538,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "28:2c:02:bf:ff:ea:05:68:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "28:2c:02:bf:ff:ea:05:68", "endpoint_id": 1, "available": true, @@ -692,22 +564,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfff1", - "endpoint_id": 1, - "cluster": { - "id": 65521, - "name": "ThirdRealityCurtainCluster", - "type": "server" - }, - "id": "1:0xfff1", - "unique_id": "28:2c:02:bf:ff:ea:05:68:1:0xfff1", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:ea:05:68", "endpoint_id": 1, "available": true, @@ -742,22 +598,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:2c:02:bf:ff:ea:05:68:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:ea:05:68", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rsb22bz.json b/tests/data/devices/third-reality-inc-3rsb22bz.json index ace43268c..ea0ae57c2 100644 --- a/tests/data/devices/third-reality-inc-3rsb22bz.json +++ b/tests/data/devices/third-reality-inc-3rsb22bz.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:2c:02:bf:ff:e3:74:f8", "nwk": "0x2711", "manufacturer": "Third Reality, Inc", @@ -172,22 +172,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e3:74:f8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e3:74:f8", "endpoint_id": 1, "available": true, @@ -216,22 +200,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e3:74:f8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e3:74:f8", "endpoint_id": 1, "available": true, @@ -260,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "28:2c:02:bf:ff:e3:74:f8:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "28:2c:02:bf:ff:e3:74:f8", "endpoint_id": 1, "available": true, @@ -312,22 +264,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff01", - "endpoint_id": 1, - "cluster": { - "id": 65281, - "name": "ThirdRealityButtonCluster", - "type": "server" - }, - "id": "1:0xff01", - "unique_id": "28:2c:02:bf:ff:e3:74:f8:1:0xff01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e3:74:f8", "endpoint_id": 1, "available": true, @@ -362,22 +298,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:2c:02:bf:ff:e3:74:f8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e3:74:f8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rsm0147z.json b/tests/data/devices/third-reality-inc-3rsm0147z.json index b9920e2a2..743a64b29 100644 --- a/tests/data/devices/third-reality-inc-3rsm0147z.json +++ b/tests/data/devices/third-reality-inc-3rsm0147z.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:2c:02:bf:ff:ef:2b:82", "nwk": "0x0B7F", "manufacturer": "Third Reality, Inc", @@ -193,22 +193,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff01", - "endpoint_id": 1, - "cluster": { - "id": 65281, - "name": "ThirdRealitySoilMoistureCluster", - "type": "server" - }, - "id": "1:0xff01", - "unique_id": "28:2c:02:bf:ff:ef:2b:82:1:0xff01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:ef:2b:82", "endpoint_id": 1, "available": true, @@ -240,22 +224,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff01", - "endpoint_id": 1, - "cluster": { - "id": 65281, - "name": "ThirdRealitySoilMoistureCluster", - "type": "server" - }, - "id": "1:0xff01", - "unique_id": "28:2c:02:bf:ff:ef:2b:82:1:0xff01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:ef:2b:82", "endpoint_id": 1, "available": true, @@ -289,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:ef:2b:82:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:ef:2b:82", "endpoint_id": 1, "available": true, @@ -333,22 +285,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:ef:2b:82:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:ef:2b:82", "endpoint_id": 1, "available": true, @@ -377,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "28:2c:02:bf:ff:ef:2b:82:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "28:2c:02:bf:ff:ef:2b:82", "endpoint_id": 1, "available": true, @@ -427,22 +347,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "28:2c:02:bf:ff:ef:2b:82:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "28:2c:02:bf:ff:ef:2b:82", "endpoint_id": 1, "available": true, @@ -471,22 +375,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "28:2c:02:bf:ff:ef:2b:82:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "28:2c:02:bf:ff:ef:2b:82", "endpoint_id": 1, "available": true, @@ -517,22 +405,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:2c:02:bf:ff:ef:2b:82:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:ef:2b:82", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rsnl02043z.json b/tests/data/devices/third-reality-inc-3rsnl02043z.json index 973885e71..f9e8dc4b9 100644 --- a/tests/data/devices/third-reality-inc-3rsnl02043z.json +++ b/tests/data/devices/third-reality-inc-3rsnl02043z.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "b4:0e:cf:d3:a1:6b:00:00", "nwk": "0x1174", "manufacturer": "Third Reality, Inc", @@ -356,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, @@ -401,22 +385,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, @@ -449,50 +417,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, @@ -553,22 +477,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, @@ -600,22 +508,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, @@ -647,22 +539,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, @@ -694,22 +570,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, @@ -743,22 +603,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, @@ -794,22 +638,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, @@ -838,22 +666,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, @@ -882,22 +694,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, @@ -928,22 +724,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "b4:0e:cf:d3:a1:6b:00:00:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "b4:0e:cf:d3:a1:6b:00:00", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rsp019bz.json b/tests/data/devices/third-reality-inc-3rsp019bz.json index 25ff08ade..784e6eea6 100644 --- a/tests/data/devices/third-reality-inc-3rsp019bz.json +++ b/tests/data/devices/third-reality-inc-3rsp019bz.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:2c:02:bf:ff:eb:09:0d", "nwk": "0xF4E0", "manufacturer": "Third Reality, Inc", @@ -329,22 +329,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "28:2c:02:bf:ff:eb:09:0d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:09:0d", "endpoint_id": 1, "available": true, @@ -377,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "28:2c:02:bf:ff:eb:09:0d:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "28:2c:02:bf:ff:eb:09:0d", "endpoint_id": 1, "available": true, @@ -428,22 +396,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:eb:09:0d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:09:0d", "endpoint_id": 1, "available": true, @@ -472,22 +424,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:eb:09:0d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:09:0d", "endpoint_id": 1, "available": true, @@ -518,22 +454,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "28:2c:02:bf:ff:eb:09:0d:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "28:2c:02:bf:ff:eb:09:0d", "endpoint_id": 1, "available": true, @@ -562,22 +482,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:2c:02:bf:ff:eb:09:0d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:09:0d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rsp02028bz.json b/tests/data/devices/third-reality-inc-3rsp02028bz.json index ddddf1a46..d2a6145a6 100644 --- a/tests/data/devices/third-reality-inc-3rsp02028bz.json +++ b/tests/data/devices/third-reality-inc-3rsp02028bz.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:2c:02:bf:ff:eb:4f:2f", "nwk": "0x3C65", "manufacturer": "Third Reality, Inc", @@ -413,22 +413,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -459,22 +443,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff03", - "endpoint_id": 1, - "cluster": { - "id": 65283, - "name": "ThirdRealityPlugCluster", - "type": "server" - }, - "id": "1:0xff03", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0xff03", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -504,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff03", - "endpoint_id": 1, - "cluster": { - "id": 65283, - "name": "ThirdRealityPlugCluster", - "type": "server" - }, - "id": "1:0xff03", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0xff03", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -551,22 +503,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff03", - "endpoint_id": 1, - "cluster": { - "id": 65283, - "name": "ThirdRealityPlugCluster", - "type": "server" - }, - "id": "1:0xff03", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0xff03", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -600,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -651,22 +571,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -695,22 +599,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -730,7 +618,7 @@ "unique_id": "28:2c:02:bf:ff:eb:4f:2f-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -739,22 +627,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -763,7 +635,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -787,22 +659,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -835,22 +691,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -882,22 +722,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -930,22 +754,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -980,22 +788,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, @@ -1024,22 +816,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:2c:02:bf:ff:eb:4f:2f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:4f:2f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rsp02064z.json b/tests/data/devices/third-reality-inc-3rsp02064z.json index 26a561967..6baf7383e 100644 --- a/tests/data/devices/third-reality-inc-3rsp02064z.json +++ b/tests/data/devices/third-reality-inc-3rsp02064z.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:bb:32:67:ac", "nwk": "0x8BA6", "manufacturer": "Third Reality, Inc", @@ -584,22 +584,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -629,22 +613,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -675,22 +643,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff03", - "endpoint_id": 1, - "cluster": { - "id": 65283, - "name": "ThirdRealityPlugCluster", - "type": "server" - }, - "id": "1:0xff03", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0xff03", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -720,22 +672,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff03", - "endpoint_id": 1, - "cluster": { - "id": 65283, - "name": "ThirdRealityPlugCluster", - "type": "server" - }, - "id": "1:0xff03", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0xff03", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -767,22 +703,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff03", - "endpoint_id": 1, - "cluster": { - "id": 65283, - "name": "ThirdRealityPlugCluster", - "type": "server" - }, - "id": "1:0xff03", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0xff03", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -816,22 +736,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -867,22 +771,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -911,22 +799,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -955,22 +827,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -997,7 +853,7 @@ "unique_id": "ab:cd:ef:12:bb:32:67:ac-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1006,22 +862,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -1030,7 +870,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT" @@ -1055,22 +895,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -1104,22 +928,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -1152,22 +960,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -1201,22 +993,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -1252,22 +1028,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, @@ -1296,22 +1056,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:bb:32:67:ac:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:32:67:ac", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rss007z.json b/tests/data/devices/third-reality-inc-3rss007z.json index c78e8e599..f6156da73 100644 --- a/tests/data/devices/third-reality-inc-3rss007z.json +++ b/tests/data/devices/third-reality-inc-3rss007z.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:2c:02:bf:ff:e0:16:01", "nwk": "0x3526", "manufacturer": "Third Reality, Inc", @@ -152,22 +152,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "28:2c:02:bf:ff:e0:16:01:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e0:16:01", "endpoint_id": 1, "available": true, @@ -200,22 +184,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e0:16:01:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e0:16:01", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e0:16:01:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e0:16:01", "endpoint_id": 1, "available": true, @@ -290,22 +242,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "28:2c:02:bf:ff:e0:16:01:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "28:2c:02:bf:ff:e0:16:01", "endpoint_id": 1, "available": true, @@ -334,22 +270,6 @@ "entity_registry_enabled_default": true, "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": "28:2c:02:bf:ff:e0:16:01:1:0x0019", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e0:16:01", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rss009z.json b/tests/data/devices/third-reality-inc-3rss009z.json index 201e0785b..f1fe4a212 100644 --- a/tests/data/devices/third-reality-inc-3rss009z.json +++ b/tests/data/devices/third-reality-inc-3rss009z.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:2c:02:bf:ff:e9:77:95", "nwk": "0x6FD0", "manufacturer": "Third Reality, Inc", @@ -198,22 +198,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff02", - "endpoint_id": 1, - "cluster": { - "id": 65282, - "name": "ThirdRealitySwitchCluster", - "type": "server" - }, - "id": "1:0xff02", - "unique_id": "28:2c:02:bf:ff:e9:77:95:1:0xff02", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e9:77:95", "endpoint_id": 1, "available": true, @@ -245,22 +229,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff02", - "endpoint_id": 1, - "cluster": { - "id": 65282, - "name": "ThirdRealitySwitchCluster", - "type": "server" - }, - "id": "1:0xff02", - "unique_id": "28:2c:02:bf:ff:e9:77:95:1:0xff02", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e9:77:95", "endpoint_id": 1, "available": true, @@ -294,22 +262,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e9:77:95:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e9:77:95", "endpoint_id": 1, "available": true, @@ -338,22 +290,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e9:77:95:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e9:77:95", "endpoint_id": 1, "available": true, @@ -382,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "28:2c:02:bf:ff:e9:77:95:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "28:2c:02:bf:ff:e9:77:95", "endpoint_id": 1, "available": true, @@ -434,22 +354,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "28:2c:02:bf:ff:e9:77:95:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "28:2c:02:bf:ff:e9:77:95", "endpoint_id": 1, "available": true, @@ -478,22 +382,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:2c:02:bf:ff:e9:77:95:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e9:77:95", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rths24bz.json b/tests/data/devices/third-reality-inc-3rths24bz.json index 696990367..fbadb8c43 100644 --- a/tests/data/devices/third-reality-inc-3rths24bz.json +++ b/tests/data/devices/third-reality-inc-3rths24bz.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:cb:f6:22:83:f0", "nwk": "0x9253", "manufacturer": "Third Reality, Inc", @@ -193,22 +193,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff01", - "endpoint_id": 1, - "cluster": { - "id": 65281, - "name": "ThirdRealityCluster", - "type": "server" - }, - "id": "1:0xff01", - "unique_id": "a4:c1:38:cb:f6:22:83:f0:1:0xff01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:cb:f6:22:83:f0", "endpoint_id": 1, "available": true, @@ -240,22 +224,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff01", - "endpoint_id": 1, - "cluster": { - "id": 65281, - "name": "ThirdRealityCluster", - "type": "server" - }, - "id": "1:0xff01", - "unique_id": "a4:c1:38:cb:f6:22:83:f0:1:0xff01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:cb:f6:22:83:f0", "endpoint_id": 1, "available": true, @@ -289,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:cb:f6:22:83:f0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:cb:f6:22:83:f0", "endpoint_id": 1, "available": true, @@ -333,22 +285,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:cb:f6:22:83:f0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:cb:f6:22:83:f0", "endpoint_id": 1, "available": true, @@ -377,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "a4:c1:38:cb:f6:22:83:f0:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "a4:c1:38:cb:f6:22:83:f0", "endpoint_id": 1, "available": true, @@ -427,22 +347,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "a4:c1:38:cb:f6:22:83:f0:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:cb:f6:22:83:f0", "endpoint_id": 1, "available": true, @@ -471,22 +375,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "a4:c1:38:cb:f6:22:83:f0:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:cb:f6:22:83:f0", "endpoint_id": 1, "available": true, @@ -517,22 +405,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "a4:c1:38:cb:f6:22:83:f0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:cb:f6:22:83:f0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rvs01031z.json b/tests/data/devices/third-reality-inc-3rvs01031z.json index faf8cee16..1eb1105b0 100644 --- a/tests/data/devices/third-reality-inc-3rvs01031z.json +++ b/tests/data/devices/third-reality-inc-3rvs01031z.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:2c:02:bf:ff:eb:ae:fe", "nwk": "0x0692", "manufacturer": "Third Reality, Inc", @@ -226,22 +226,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "28:2c:02:bf:ff:eb:ae:fe:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:ae:fe", "endpoint_id": 1, "available": true, @@ -271,22 +255,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:eb:ae:fe:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:ae:fe", "endpoint_id": 1, "available": true, @@ -315,22 +283,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:eb:ae:fe:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:ae:fe", "endpoint_id": 1, "available": true, @@ -359,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "28:2c:02:bf:ff:eb:ae:fe:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "28:2c:02:bf:ff:eb:ae:fe", "endpoint_id": 1, "available": true, @@ -411,22 +347,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:2c:02:bf:ff:eb:ae:fe:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:eb:ae:fe", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/third-reality-inc-3rws18bz.json b/tests/data/devices/third-reality-inc-3rws18bz.json index f56348709..a04c64adc 100644 --- a/tests/data/devices/third-reality-inc-3rws18bz.json +++ b/tests/data/devices/third-reality-inc-3rws18bz.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "28:2c:02:bf:ff:e7:c9:49", "nwk": "0xE213", "manufacturer": "Third Reality, Inc", @@ -244,22 +244,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "28:2c:02:bf:ff:e7:c9:49:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:c9:49", "endpoint_id": 1, "available": true, @@ -287,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "28:2c:02:bf:ff:e7:c9:49:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:c9:49", "endpoint_id": 1, "available": true, @@ -332,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff01", - "endpoint_id": 1, - "cluster": { - "id": 65281, - "name": "ThirdRealityWaterLeakCluster", - "type": "server" - }, - "id": "1:0xff01", - "unique_id": "28:2c:02:bf:ff:e7:c9:49:1:0xff01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:c9:49", "endpoint_id": 1, "available": true, @@ -381,22 +333,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e7:c9:49:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:c9:49", "endpoint_id": 1, "available": true, @@ -425,22 +361,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "28:2c:02:bf:ff:e7:c9:49:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:c9:49", "endpoint_id": 1, "available": true, @@ -469,22 +389,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "28:2c:02:bf:ff:e7:c9:49:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "28:2c:02:bf:ff:e7:c9:49", "endpoint_id": 1, "available": true, @@ -521,22 +425,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xff01", - "endpoint_id": 1, - "cluster": { - "id": 65281, - "name": "ThirdRealityWaterLeakCluster", - "type": "server" - }, - "id": "1:0xff01", - "unique_id": "28:2c:02:bf:ff:e7:c9:49:1:0xff01", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:c9:49", "endpoint_id": 1, "available": true, @@ -571,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "28:2c:02:bf:ff:e7:c9:49:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "28:2c:02:bf:ff:e7:c9:49", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/trust-international-b-v-zll-colortempera.json b/tests/data/devices/trust-international-b-v-zll-colortempera.json index 6755a6831..246ba7090 100644 --- a/tests/data/devices/trust-international-b-v-zll-colortempera.json +++ b/tests/data/devices/trust-international-b-v-zll-colortempera.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:12:27:74:4f", "nwk": "0x2E91", "manufacturer": "Trust International B.V.", @@ -387,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:12:27:74:4f:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:12:27:74:4f", "endpoint_id": 1, "available": true, @@ -432,22 +416,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:12:27:74:4f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:12:27:74:4f", "endpoint_id": 1, "available": true, @@ -480,50 +448,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:12:27:74:4f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:12:27:74:4f:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:12:27:74:4f:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:12:27:74:4f", "endpoint_id": 1, "available": true, @@ -578,22 +502,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:12:27:74:4f:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:12:27:74:4f", "endpoint_id": 1, "available": true, @@ -627,22 +535,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:12:27:74:4f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:12:27:74:4f", "endpoint_id": 1, "available": true, @@ -671,22 +563,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:12:27:74:4f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:12:27:74:4f", "endpoint_id": 1, "available": true, @@ -717,22 +593,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:12:27:74:4f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:12:27:74:4f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tubeszb-tubeszb-router.json b/tests/data/devices/tubeszb-tubeszb-router.json index dc02d5d63..37058ba8f 100644 --- a/tests/data/devices/tubeszb-tubeszb-router.json +++ b/tests/data/devices/tubeszb-tubeszb-router.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:12:4b:00:22:98:38:6d", "nwk": "0xC862", "manufacturer": "TubesZB", @@ -182,22 +182,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 8, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "8:0x0003", - "unique_id": "00:12:4b:00:22:98:38:6d:8:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:22:98:38:6d", "endpoint_id": 8, "available": true, @@ -230,22 +214,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 8, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "8:0x0000", - "unique_id": "00:12:4b:00:22:98:38:6d:8:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:22:98:38:6d", "endpoint_id": 8, "available": true, @@ -274,22 +242,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 8, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "8:0x0000", - "unique_id": "00:12:4b:00:22:98:38:6d:8:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:12:4b:00:22:98:38:6d", "endpoint_id": 8, "available": true, diff --git a/tests/data/devices/tuyatec-gqhxixyk-rh3052.json b/tests/data/devices/tuyatec-gqhxixyk-rh3052.json index da5158b0d..c53c1bc53 100644 --- a/tests/data/devices/tuyatec-gqhxixyk-rh3052.json +++ b/tests/data/devices/tuyatec-gqhxixyk-rh3052.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "60:a4:23:ff:fe:37:11:33", "nwk": "0xC8DF", "manufacturer": "TUYATEC-gqhxixyk", @@ -198,22 +198,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "60:a4:23:ff:fe:37:11:33:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "60:a4:23:ff:fe:37:11:33", "endpoint_id": 1, "available": true, @@ -246,22 +230,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "60:a4:23:ff:fe:37:11:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "60:a4:23:ff:fe:37:11:33", "endpoint_id": 1, "available": true, @@ -290,22 +258,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "60:a4:23:ff:fe:37:11:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "60:a4:23:ff:fe:37:11:33", "endpoint_id": 1, "available": true, @@ -334,22 +286,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "60:a4:23:ff:fe:37:11:33:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "60:a4:23:ff:fe:37:11:33", "endpoint_id": 1, "available": true, @@ -384,22 +320,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "60:a4:23:ff:fe:37:11:33:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "60:a4:23:ff:fe:37:11:33", "endpoint_id": 1, "available": true, @@ -428,22 +348,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "60:a4:23:ff:fe:37:11:33:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "60:a4:23:ff:fe:37:11:33", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tuyatec-r9hgssol-rh3001.json b/tests/data/devices/tuyatec-r9hgssol-rh3001.json index 4684994cc..fff5b87e7 100644 --- a/tests/data/devices/tuyatec-r9hgssol-rh3001.json +++ b/tests/data/devices/tuyatec-r9hgssol-rh3001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "68:0a:e2:ff:fe:f1:b5:18", "nwk": "0x9A9D", "manufacturer": "TUYATEC-r9hgssol", @@ -206,22 +206,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "68:0a:e2:ff:fe:f1:b5:18:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:f1:b5:18", "endpoint_id": 1, "available": true, @@ -251,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "68:0a:e2:ff:fe:f1:b5:18:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:f1:b5:18", "endpoint_id": 1, "available": true, @@ -299,22 +267,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "68:0a:e2:ff:fe:f1:b5:18:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:f1:b5:18", "endpoint_id": 1, "available": true, @@ -343,22 +295,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "68:0a:e2:ff:fe:f1:b5:18:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:f1:b5:18", "endpoint_id": 1, "available": true, @@ -387,22 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "68:0a:e2:ff:fe:f1:b5:18:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "68:0a:e2:ff:fe:f1:b5:18", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tuyatec-rkqiqvcs-rh3001.json b/tests/data/devices/tuyatec-rkqiqvcs-rh3001.json index 7ed9ea8c0..a156b728b 100644 --- a/tests/data/devices/tuyatec-rkqiqvcs-rh3001.json +++ b/tests/data/devices/tuyatec-rkqiqvcs-rh3001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ec:1b:bd:ff:fe:c9:02:65", "nwk": "0x7A9B", "manufacturer": "TUYATEC-rkqiqvcs", @@ -212,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ec:1b:bd:ff:fe:c9:02:65:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:c9:02:65", "endpoint_id": 1, "available": true, @@ -257,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ec:1b:bd:ff:fe:c9:02:65:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:c9:02:65", "endpoint_id": 1, "available": true, @@ -305,22 +273,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:c9:02:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:c9:02:65", "endpoint_id": 1, "available": true, @@ -349,22 +301,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:c9:02:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:c9:02:65", "endpoint_id": 1, "available": true, @@ -393,22 +329,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ec:1b:bd:ff:fe:c9:02:65:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ec:1b:bd:ff:fe:c9:02:65", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tuyatec-yg5dcbfu-rh3052.json b/tests/data/devices/tuyatec-yg5dcbfu-rh3052.json index f7df8c88f..afead449d 100644 --- a/tests/data/devices/tuyatec-yg5dcbfu-rh3052.json +++ b/tests/data/devices/tuyatec-yg5dcbfu-rh3052.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "14:b4:57:ff:fe:3b:04:ec", "nwk": "0x2F13", "manufacturer": "TUYATEC-yg5dcbfu", @@ -210,22 +210,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "14:b4:57:ff:fe:3b:04:ec:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:3b:04:ec", "endpoint_id": 1, "available": true, @@ -258,22 +242,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:b4:57:ff:fe:3b:04:ec:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:3b:04:ec", "endpoint_id": 1, "available": true, @@ -302,22 +270,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "14:b4:57:ff:fe:3b:04:ec:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "14:b4:57:ff:fe:3b:04:ec", "endpoint_id": 1, "available": true, @@ -346,22 +298,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "14:b4:57:ff:fe:3b:04:ec:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "14:b4:57:ff:fe:3b:04:ec", "endpoint_id": 1, "available": true, @@ -396,22 +332,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "14:b4:57:ff:fe:3b:04:ec:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "14:b4:57:ff:fe:3b:04:ec", "endpoint_id": 1, "available": true, @@ -440,22 +360,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "14:b4:57:ff:fe:3b:04:ec:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "14:b4:57:ff:fe:3b:04:ec", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tyst11-czk78ptr-zk78ptr.json b/tests/data/devices/tyst11-czk78ptr-zk78ptr.json index a186efb9a..a98833a2e 100644 --- a/tests/data/devices/tyst11-czk78ptr-zk78ptr.json +++ b/tests/data/devices/tyst11-czk78ptr-zk78ptr.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:9d:fd:87:35", "nwk": "0xC52F", "manufacturer": "_TYST11_czk78ptr", @@ -240,22 +240,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:9d:fd:87:35:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:fd:87:35", "endpoint_id": 1, "available": true, @@ -288,22 +272,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9d:fd:87:35:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9d:fd:87:35", "endpoint_id": 1, "available": true, @@ -367,22 +335,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:9d:fd:87:35:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:fd:87:35", "endpoint_id": 1, "available": true, @@ -419,22 +371,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9d:fd:87:35:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:fd:87:35", "endpoint_id": 1, "available": true, @@ -463,22 +399,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9d:fd:87:35:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:fd:87:35", "endpoint_id": 1, "available": true, @@ -507,22 +427,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:9d:fd:87:35:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:9d:fd:87:35", "endpoint_id": 1, "available": true, @@ -558,22 +462,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9d:fd:87:35:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9d:fd:87:35", "endpoint_id": 1, "available": true, @@ -602,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9d:fd:87:35:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9d:fd:87:35", "endpoint_id": 1, "available": true, @@ -646,22 +518,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9d:fd:87:35:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9d:fd:87:35", "endpoint_id": 1, "available": true, @@ -690,22 +546,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9d:fd:87:35:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9d:fd:87:35", "endpoint_id": 1, "available": true, @@ -736,22 +576,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:9d:fd:87:35:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:fd:87:35", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tyst11-i5j6ifxj-5j6ifxj.json b/tests/data/devices/tyst11-i5j6ifxj-5j6ifxj.json index c23ca26d5..845c60473 100644 --- a/tests/data/devices/tyst11-i5j6ifxj-5j6ifxj.json +++ b/tests/data/devices/tyst11-i5j6ifxj-5j6ifxj.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ec:1b:bd:ff:fe:30:2e:51", "nwk": "0x8B01", "manufacturer": "_TYST11_i5j6ifxj", @@ -185,22 +185,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ec:1b:bd:ff:fe:30:2e:51:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:30:2e:51", "endpoint_id": 1, "available": true, @@ -230,22 +214,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ec:1b:bd:ff:fe:30:2e:51:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:30:2e:51", "endpoint_id": 1, "available": true, @@ -278,22 +246,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:30:2e:51:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:30:2e:51", "endpoint_id": 1, "available": true, @@ -322,22 +274,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:30:2e:51:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:30:2e:51", "endpoint_id": 1, "available": true, @@ -368,22 +304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ec:1b:bd:ff:fe:30:2e:51:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:30:2e:51", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tyzb01-1xktopx6-ts0041a.json b/tests/data/devices/tyzb01-1xktopx6-ts0041a.json index 11e18dc83..d9c04fdde 100644 --- a/tests/data/devices/tyzb01-1xktopx6-ts0041a.json +++ b/tests/data/devices/tyzb01-1xktopx6-ts0041a.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8d:76:87:d5", "nwk": "0xD177", "manufacturer": "_TYZB01_1xktopx6", @@ -173,22 +173,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:76:87:d5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:76:87:d5", "endpoint_id": 1, "available": true, @@ -217,22 +201,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:76:87:d5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:76:87:d5", "endpoint_id": 1, "available": true, @@ -261,22 +229,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:8d:76:87:d5:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:8d:76:87:d5", "endpoint_id": 1, "available": true, @@ -313,22 +265,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:8d:76:87:d5:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:8d:76:87:d5", "endpoint_id": 1, "available": true, @@ -357,22 +293,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8d:76:87:d5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:76:87:d5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tyzb01-8scntis1-ts0216.json b/tests/data/devices/tyzb01-8scntis1-ts0216.json index 9f5e1abb3..dffdddeeb 100644 --- a/tests/data/devices/tyzb01-8scntis1-ts0216.json +++ b/tests/data/devices/tyzb01-8scntis1-ts0216.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:52:26:72:dc", "nwk": "0xC264", "manufacturer": "_TYZB01_8scntis1", @@ -247,22 +247,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:52:26:72:dc:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:26:72:dc", "endpoint_id": 1, "available": true, @@ -292,22 +276,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:52:26:72:dc:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:26:72:dc", "endpoint_id": 1, "available": true, @@ -340,22 +308,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "ab:cd:ef:12:52:26:72:dc:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:26:72:dc", "endpoint_id": 1, "available": true, @@ -389,22 +341,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "ab:cd:ef:12:52:26:72:dc:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:26:72:dc", "endpoint_id": 1, "available": true, @@ -436,22 +372,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "ab:cd:ef:12:52:26:72:dc:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:26:72:dc", "endpoint_id": 1, "available": true, @@ -485,22 +405,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "ab:cd:ef:12:52:26:72:dc:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:26:72:dc", "endpoint_id": 1, "available": true, @@ -539,22 +443,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:52:26:72:dc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:26:72:dc", "endpoint_id": 1, "available": true, @@ -583,22 +471,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:52:26:72:dc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:26:72:dc", "endpoint_id": 1, "available": true, @@ -629,22 +501,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IasWdClusterHandler", - "generic_id": "cluster_handler_0x0502", - "endpoint_id": 1, - "cluster": { - "id": 1282, - "name": "IAS Warning Device", - "type": "server" - }, - "id": "1:0x0502", - "unique_id": "ab:cd:ef:12:52:26:72:dc:1:0x0502", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:26:72:dc", "endpoint_id": 1, "available": true, @@ -682,22 +538,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:52:26:72:dc:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:26:72:dc", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tyzb01-mtunwanm-ts011f.json b/tests/data/devices/tyzb01-mtunwanm-ts011f.json index 238074349..1a8033aaf 100644 --- a/tests/data/devices/tyzb01-mtunwanm-ts011f.json +++ b/tests/data/devices/tyzb01-mtunwanm-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:34:72:86:1c", "nwk": "0xFB70", "manufacturer": "_TYZB01_mtunwanm", @@ -184,22 +184,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:34:72:86:1c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:72:86:1c", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:34:72:86:1c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:72:86:1c", "endpoint_id": 1, "available": true, @@ -274,22 +242,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:34:72:86:1c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:34:72:86:1c", "endpoint_id": 1, "available": true, @@ -318,22 +270,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:34:72:86:1c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:72:86:1c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tyzb01-o63ssaah-ts0207.json b/tests/data/devices/tyzb01-o63ssaah-ts0207.json index b1824fc60..92cca64c8 100644 --- a/tests/data/devices/tyzb01-o63ssaah-ts0207.json +++ b/tests/data/devices/tyzb01-o63ssaah-ts0207.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ec:1b:bd:ff:fe:87:d5:3e", "nwk": "0xFF7C", "manufacturer": "_TYZB01_o63ssaah", @@ -231,22 +231,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ec:1b:bd:ff:fe:87:d5:3e:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:87:d5:3e", "endpoint_id": 1, "available": true, @@ -276,22 +260,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ec:1b:bd:ff:fe:87:d5:3e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:87:d5:3e", "endpoint_id": 1, "available": true, @@ -324,22 +292,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:87:d5:3e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:87:d5:3e", "endpoint_id": 1, "available": true, @@ -368,22 +320,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:87:d5:3e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:87:d5:3e", "endpoint_id": 1, "available": true, @@ -412,22 +348,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ec:1b:bd:ff:fe:87:d5:3e:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ec:1b:bd:ff:fe:87:d5:3e", "endpoint_id": 1, "available": true, @@ -464,22 +384,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ec:1b:bd:ff:fe:87:d5:3e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:87:d5:3e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tyzb01-qm6djpta-ts0215.json b/tests/data/devices/tyzb01-qm6djpta-ts0215.json index 28b709b34..57b003069 100644 --- a/tests/data/devices/tyzb01-qm6djpta-ts0215.json +++ b/tests/data/devices/tyzb01-qm6djpta-ts0215.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:09:4e:ff:d3", "nwk": "0x613B", "manufacturer": "_TYZB01_qm6djpta", @@ -232,22 +232,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IasAceClientClusterHandler", - "generic_id": "cluster_handler_0x0501_client", - "endpoint_id": 1, - "cluster": { - "id": 1281, - "name": "IAS Ancillary Control Equipment", - "type": "client" - }, - "id": "1:0x0501_client", - "unique_id": "ab:cd:ef:12:09:4e:ff:d3:1:0x0501_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:09:4e:ff:d3", "endpoint_id": 1, "available": true, @@ -279,22 +263,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:09:4e:ff:d3:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:09:4e:ff:d3", "endpoint_id": 1, "available": true, @@ -324,22 +292,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:09:4e:ff:d3:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:09:4e:ff:d3", "endpoint_id": 1, "available": true, @@ -372,22 +324,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:09:4e:ff:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:09:4e:ff:d3", "endpoint_id": 1, "available": true, @@ -416,22 +352,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:09:4e:ff:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:09:4e:ff:d3", "endpoint_id": 1, "available": true, @@ -460,22 +380,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:09:4e:ff:d3:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:09:4e:ff:d3", "endpoint_id": 1, "available": true, @@ -512,22 +416,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:09:4e:ff:d3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:09:4e:ff:d3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tyzb01-rifa0wlb-ts0011.json b/tests/data/devices/tyzb01-rifa0wlb-ts0011.json index d1b826878..521ddd37a 100755 --- a/tests/data/devices/tyzb01-rifa0wlb-ts0011.json +++ b/tests/data/devices/tyzb01-rifa0wlb-ts0011.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ec:1b:bd:ff:fe:d0:ef:d2", "nwk": "0x8481", "manufacturer": "_TYZB01_rifa0wlb", @@ -215,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ec:1b:bd:ff:fe:d0:ef:d2:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ec:1b:bd:ff:fe:d0:ef:d2", "endpoint_id": 1, "available": true, @@ -283,22 +267,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:d0:ef:d2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:d0:ef:d2", "endpoint_id": 1, "available": true, @@ -327,22 +295,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:d0:ef:d2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:d0:ef:d2", "endpoint_id": 1, "available": true, @@ -373,22 +325,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ec:1b:bd:ff:fe:d0:ef:d2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:d0:ef:d2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tyzb01-vkwryfdr-ts0115.json b/tests/data/devices/tyzb01-vkwryfdr-ts0115.json index 60bd5cf5b..c5e2f207e 100644 --- a/tests/data/devices/tyzb01-vkwryfdr-ts0115.json +++ b/tests/data/devices/tyzb01-vkwryfdr-ts0115.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ec:1b:bd:ff:fe:2d:af:ac", "nwk": "0xF585", "manufacturer": "_TYZB01_vkwryfdr", @@ -359,22 +359,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:2d:af:ac:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:2d:af:ac", "endpoint_id": 1, "available": true, @@ -403,22 +387,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ec:1b:bd:ff:fe:2d:af:ac:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:2d:af:ac", "endpoint_id": 1, "available": true, @@ -449,22 +417,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ec:1b:bd:ff:fe:2d:af:ac:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ec:1b:bd:ff:fe:2d:af:ac", "endpoint_id": 1, "available": true, @@ -491,22 +443,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ec:1b:bd:ff:fe:2d:af:ac:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ec:1b:bd:ff:fe:2d:af:ac", "endpoint_id": 2, "available": true, @@ -533,22 +469,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ec:1b:bd:ff:fe:2d:af:ac:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ec:1b:bd:ff:fe:2d:af:ac", "endpoint_id": 3, "available": true, @@ -575,22 +495,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ec:1b:bd:ff:fe:2d:af:ac:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ec:1b:bd:ff:fe:2d:af:ac", "endpoint_id": 4, "available": true, @@ -617,22 +521,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 7, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "7:0x0006", - "unique_id": "ec:1b:bd:ff:fe:2d:af:ac:7:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ec:1b:bd:ff:fe:2d:af:ac", "endpoint_id": 7, "available": true, @@ -661,22 +549,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ec:1b:bd:ff:fe:2d:af:ac:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ec:1b:bd:ff:fe:2d:af:ac", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tyzb01-zanh6v1o-ts0121.json b/tests/data/devices/tyzb01-zanh6v1o-ts0121.json index 7ef39dc90..af8e2fdc7 100644 --- a/tests/data/devices/tyzb01-zanh6v1o-ts0121.json +++ b/tests/data/devices/tyzb01-zanh6v1o-ts0121.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "cc:cc:cc:ff:fe:da:b1:e0", "nwk": "0xE178", "manufacturer": "_TYZB01_zanh6v1o", @@ -415,22 +415,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "cc:cc:cc:ff:fe:da:b1:e0:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "cc:cc:cc:ff:fe:da:b1:e0", "endpoint_id": 1, "available": true, @@ -463,22 +447,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "cc:cc:cc:ff:fe:da:b1:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "cc:cc:cc:ff:fe:da:b1:e0", "endpoint_id": 1, "available": true, @@ -507,22 +475,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "cc:cc:cc:ff:fe:da:b1:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "cc:cc:cc:ff:fe:da:b1:e0", "endpoint_id": 1, "available": true, @@ -551,22 +503,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "cc:cc:cc:ff:fe:da:b1:e0:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "cc:cc:cc:ff:fe:da:b1:e0", "endpoint_id": 1, "available": true, @@ -594,7 +530,7 @@ "unique_id": "cc:cc:cc:ff:fe:da:b1:e0-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -603,22 +539,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "cc:cc:cc:ff:fe:da:b1:e0:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "cc:cc:cc:ff:fe:da:b1:e0", "endpoint_id": 1, "available": true, @@ -627,7 +547,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 1.0 }, @@ -651,22 +571,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "cc:cc:cc:ff:fe:da:b1:e0:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "cc:cc:cc:ff:fe:da:b1:e0", "endpoint_id": 1, "available": true, @@ -699,22 +603,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "cc:cc:cc:ff:fe:da:b1:e0:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "cc:cc:cc:ff:fe:da:b1:e0", "endpoint_id": 1, "available": true, @@ -749,22 +637,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "cc:cc:cc:ff:fe:da:b1:e0:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "cc:cc:cc:ff:fe:da:b1:e0", "endpoint_id": 1, "available": true, @@ -793,22 +665,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "cc:cc:cc:ff:fe:da:b1:e0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "cc:cc:cc:ff:fe:da:b1:e0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz2000-k4yr34vv-sm0301.json b/tests/data/devices/tz2000-k4yr34vv-sm0301.json index b8877f386..0fc1ba6ff 100644 --- a/tests/data/devices/tz2000-k4yr34vv-sm0301.json +++ b/tests/data/devices/tz2000-k4yr34vv-sm0301.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:27:35:c8:17", "nwk": "0xF38E", "manufacturer": "_TZ2000_k4yr34vv", @@ -311,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:27:35:c8:17:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:27:35:c8:17", "endpoint_id": 1, "available": true, @@ -359,50 +343,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:27:35:c8:17:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:27:35:c8:17:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ShadeClusterHandler", - "generic_id": "cluster_handler_0x0100", - "endpoint_id": 1, - "cluster": { - "id": 256, - "name": "Shade Configuration", - "type": "server" - }, - "id": "1:0x0100", - "unique_id": "ab:cd:ef:12:27:35:c8:17:1:0x0100", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:27:35:c8:17", "endpoint_id": 1, "available": true, @@ -433,22 +373,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:27:35:c8:17:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:27:35:c8:17", "endpoint_id": 1, "available": true, @@ -480,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:27:35:c8:17:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:27:35:c8:17", "endpoint_id": 1, "available": true, @@ -529,22 +437,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:27:35:c8:17:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:27:35:c8:17", "endpoint_id": 1, "available": true, @@ -580,22 +472,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:27:35:c8:17:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:27:35:c8:17", "endpoint_id": 1, "available": true, @@ -624,22 +500,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:27:35:c8:17:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:27:35:c8:17", "endpoint_id": 1, "available": true, @@ -670,22 +530,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:27:35:c8:17:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:27:35:c8:17", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-09gto2zn-ts0013.json b/tests/data/devices/tz3000-09gto2zn-ts0013.json index d4a2cf516..a61b050ca 100644 --- a/tests/data/devices/tz3000-09gto2zn-ts0013.json +++ b/tests/data/devices/tz3000-09gto2zn-ts0013.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:34:aa:29:f4", "nwk": "0x8678", "manufacturer": "_TZ3000_09gto2zn", @@ -292,22 +292,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:34:aa:29:f4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:aa:29:f4", "endpoint_id": 1, "available": true, @@ -340,22 +324,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:34:aa:29:f4:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:34:aa:29:f4", "endpoint_id": 1, "available": true, @@ -406,22 +374,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:34:aa:29:f4:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:34:aa:29:f4", "endpoint_id": 2, "available": true, @@ -472,22 +424,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:34:aa:29:f4:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:34:aa:29:f4", "endpoint_id": 3, "available": true, @@ -540,22 +476,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:34:aa:29:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:aa:29:f4", "endpoint_id": 1, "available": true, @@ -584,22 +504,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:34:aa:29:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:aa:29:f4", "endpoint_id": 1, "available": true, @@ -630,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:34:aa:29:f4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:aa:29:f4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-1dd0d5yi-ts130f.json b/tests/data/devices/tz3000-1dd0d5yi-ts130f.json index 7735d55f9..3fc115b8c 100644 --- a/tests/data/devices/tz3000-1dd0d5yi-ts130f.json +++ b/tests/data/devices/tz3000-1dd0d5yi-ts130f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:15:80:89:33", "nwk": "0xB0E7", "manufacturer": "_TZ3000_1dd0d5yi", @@ -404,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:15:80:89:33:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:15:80:89:33", "endpoint_id": 1, "available": true, @@ -454,22 +438,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:15:80:89:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:80:89:33", "endpoint_id": 1, "available": true, @@ -498,22 +466,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:15:80:89:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:80:89:33", "endpoint_id": 1, "available": true, @@ -544,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:15:80:89:33:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:15:80:89:33", "endpoint_id": 1, "available": true, @@ -588,22 +524,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:15:80:89:33:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:80:89:33", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-1o6x1bl0-ts0201.json b/tests/data/devices/tz3000-1o6x1bl0-ts0201.json index 0a44f47c7..428a42d3c 100644 --- a/tests/data/devices/tz3000-1o6x1bl0-ts0201.json +++ b/tests/data/devices/tz3000-1o6x1bl0-ts0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d0:74:74:bf", "nwk": "0x6055", "manufacturer": "_TZ3000_1o6x1bl0", @@ -198,22 +198,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d0:74:74:bf:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d0:74:74:bf", "endpoint_id": 1, "available": true, @@ -246,22 +230,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d0:74:74:bf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d0:74:74:bf", "endpoint_id": 1, "available": true, @@ -290,22 +258,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d0:74:74:bf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d0:74:74:bf", "endpoint_id": 1, "available": true, @@ -334,22 +286,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:d0:74:74:bf:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:d0:74:74:bf", "endpoint_id": 1, "available": true, @@ -384,22 +320,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:d0:74:74:bf:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d0:74:74:bf", "endpoint_id": 1, "available": true, @@ -430,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d0:74:74:bf:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d0:74:74:bf", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-2putqrmw-ts011f.json b/tests/data/devices/tz3000-2putqrmw-ts011f.json index 54f19ad9d..064e9d539 100644 --- a/tests/data/devices/tz3000-2putqrmw-ts011f.json +++ b/tests/data/devices/tz3000-2putqrmw-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2b:c6:61:bc", "nwk": "0x6ADB", "manufacturer": "_TZ3000_2putqrmw", @@ -432,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:2b:c6:61:bc:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2b:c6:61:bc", "endpoint_id": 1, "available": true, @@ -480,22 +464,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2b:c6:61:bc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2b:c6:61:bc", "endpoint_id": 1, "available": true, @@ -524,22 +492,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2b:c6:61:bc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2b:c6:61:bc", "endpoint_id": 1, "available": true, @@ -559,7 +511,7 @@ "unique_id": "ab:cd:ef:12:2b:c6:61:bc-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -568,22 +520,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:2b:c6:61:bc:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:2b:c6:61:bc", "endpoint_id": 1, "available": true, @@ -592,7 +528,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 5.16, "device_type": "Electric Metering", @@ -611,7 +547,7 @@ "unique_id": "ab:cd:ef:12:2b:c6:61:bc-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -620,22 +556,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2b:c6:61:bc:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2b:c6:61:bc", "endpoint_id": 1, "available": true, @@ -644,7 +564,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -668,22 +588,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2b:c6:61:bc:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2b:c6:61:bc", "endpoint_id": 1, "available": true, @@ -715,22 +619,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2b:c6:61:bc:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2b:c6:61:bc", "endpoint_id": 1, "available": true, @@ -763,22 +651,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2b:c6:61:bc:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2b:c6:61:bc", "endpoint_id": 1, "available": true, @@ -813,22 +685,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:2b:c6:61:bc:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2b:c6:61:bc", "endpoint_id": 1, "available": true, @@ -857,22 +713,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:2b:c6:61:bc:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2b:c6:61:bc", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-2xlvlnez-ts011f.json b/tests/data/devices/tz3000-2xlvlnez-ts011f.json index 0f9aa2192..8366fcae2 100644 --- a/tests/data/devices/tz3000-2xlvlnez-ts011f.json +++ b/tests/data/devices/tz3000-2xlvlnez-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7b:03:ef:df", "nwk": "0x3503", "manufacturer": "_TZ3000_2xlvlnez", @@ -550,22 +550,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:7b:03:ef:df:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:03:ef:df", "endpoint_id": 1, "available": true, @@ -598,22 +582,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:03:ef:df:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:03:ef:df", "endpoint_id": 1, "available": true, @@ -642,22 +610,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:03:ef:df:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:03:ef:df", "endpoint_id": 1, "available": true, @@ -677,7 +629,7 @@ "unique_id": "ab:cd:ef:12:7b:03:ef:df-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": null, @@ -686,22 +638,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:7b:03:ef:df:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:7b:03:ef:df", "endpoint_id": 1, "available": true, @@ -710,7 +646,7 @@ "unit": null }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 0.0, "zcl_unit_of_measurement": null @@ -727,7 +663,7 @@ "unique_id": "ab:cd:ef:12:7b:03:ef:df-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -736,22 +672,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:7b:03:ef:df:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:7b:03:ef:df", "endpoint_id": 1, "available": true, @@ -760,7 +680,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -784,22 +704,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:7b:03:ef:df:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:7b:03:ef:df", "endpoint_id": 1, "available": true, @@ -832,22 +736,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:7b:03:ef:df:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:7b:03:ef:df", "endpoint_id": 1, "available": true, @@ -882,22 +770,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:7b:03:ef:df:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:7b:03:ef:df", "endpoint_id": 1, "available": true, @@ -924,22 +796,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:7b:03:ef:df:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:7b:03:ef:df", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/tz3000-303avxxt-ts011f.json b/tests/data/devices/tz3000-303avxxt-ts011f.json index b0fd10831..4205c6854 100644 --- a/tests/data/devices/tz3000-303avxxt-ts011f.json +++ b/tests/data/devices/tz3000-303avxxt-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:fb:76:78:ad", "nwk": "0x8305", "manufacturer": "_TZ3000_303avxxt", @@ -486,22 +486,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, @@ -534,22 +518,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, @@ -582,22 +550,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, @@ -632,22 +584,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, @@ -676,22 +612,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, @@ -711,7 +631,7 @@ "unique_id": "ab:cd:ef:12:fb:76:78:ad-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -720,22 +640,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, @@ -744,7 +648,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 0.0, "device_type": "Electric Metering", @@ -763,7 +667,7 @@ "unique_id": "ab:cd:ef:12:fb:76:78:ad-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -772,22 +676,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, @@ -796,7 +684,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -820,22 +708,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, @@ -868,22 +740,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, @@ -918,22 +774,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, @@ -960,22 +800,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, @@ -1010,22 +834,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:fb:76:78:ad:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fb:76:78:ad", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-3ias4w4o-ts011f.json b/tests/data/devices/tz3000-3ias4w4o-ts011f.json index 340b77954..849ad9925 100644 --- a/tests/data/devices/tz3000-3ias4w4o-ts011f.json +++ b/tests/data/devices/tz3000-3ias4w4o-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:17:45:af:eb", "nwk": "0x1614", "manufacturer": "_TZ3000_3ias4w4o", @@ -535,22 +535,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:17:45:af:eb:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:17:45:af:eb", "endpoint_id": 1, "available": true, @@ -583,22 +567,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:17:45:af:eb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:17:45:af:eb", "endpoint_id": 1, "available": true, @@ -627,22 +595,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:17:45:af:eb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:17:45:af:eb", "endpoint_id": 1, "available": true, @@ -662,7 +614,7 @@ "unique_id": "ab:cd:ef:12:17:45:af:eb-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -671,22 +623,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:17:45:af:eb:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:17:45:af:eb", "endpoint_id": 1, "available": true, @@ -695,7 +631,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 295.79, "device_type": "Electric Metering", @@ -714,7 +650,7 @@ "unique_id": "ab:cd:ef:12:17:45:af:eb-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -723,22 +659,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:17:45:af:eb:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:17:45:af:eb", "endpoint_id": 1, "available": true, @@ -747,7 +667,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 2231.0 }, @@ -771,22 +691,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:17:45:af:eb:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:17:45:af:eb", "endpoint_id": 1, "available": true, @@ -819,22 +723,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:17:45:af:eb:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:17:45:af:eb", "endpoint_id": 1, "available": true, @@ -869,22 +757,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:17:45:af:eb:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:17:45:af:eb", "endpoint_id": 1, "available": true, @@ -913,22 +785,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:17:45:af:eb:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:17:45:af:eb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-5e235jpa-ts0042.json b/tests/data/devices/tz3000-5e235jpa-ts0042.json index 78cd25924..f52637ef7 100644 --- a/tests/data/devices/tz3000-5e235jpa-ts0042.json +++ b/tests/data/devices/tz3000-5e235jpa-ts0042.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a1:e0:ec:6e", "nwk": "0x6884", "manufacturer": "_TZ3000_5e235jpa", @@ -189,22 +189,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a1:e0:ec:6e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:e0:ec:6e", "endpoint_id": 1, "available": true, @@ -233,22 +217,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a1:e0:ec:6e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:e0:ec:6e", "endpoint_id": 1, "available": true, @@ -277,22 +245,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:a1:e0:ec:6e:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:a1:e0:ec:6e", "endpoint_id": 1, "available": true, @@ -327,22 +279,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "ab:cd:ef:12:a1:e0:ec:6e:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:a1:e0:ec:6e", "endpoint_id": 2, "available": true, @@ -378,22 +314,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:a1:e0:ec:6e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a1:e0:ec:6e", "endpoint_id": 1, "available": true, @@ -420,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:a1:e0:ec:6e:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a1:e0:ec:6e", "endpoint_id": 2, "available": true, @@ -464,22 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a1:e0:ec:6e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:e0:ec:6e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-5fkufhn1-ts0502a.json b/tests/data/devices/tz3000-5fkufhn1-ts0502a.json index 48ef36c7c..64d3610d5 100644 --- a/tests/data/devices/tz3000-5fkufhn1-ts0502a.json +++ b/tests/data/devices/tz3000-5fkufhn1-ts0502a.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:97:4b:44:fd", "nwk": "0xB5E6", "manufacturer": "_TZ3000_5fkufhn1", @@ -323,22 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:97:4b:44:fd:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:4b:44:fd", "endpoint_id": 1, "available": true, @@ -371,50 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:97:4b:44:fd:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:97:4b:44:fd:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:97:4b:44:fd:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:97:4b:44:fd", "endpoint_id": 1, "available": true, @@ -473,22 +413,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:97:4b:44:fd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:4b:44:fd", "endpoint_id": 1, "available": true, @@ -517,22 +441,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:97:4b:44:fd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:4b:44:fd", "endpoint_id": 1, "available": true, @@ -563,22 +471,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:97:4b:44:fd:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:4b:44:fd", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-5ity3zyu-ts0121.json b/tests/data/devices/tz3000-5ity3zyu-ts0121.json index 823406c6c..6e82f328d 100644 --- a/tests/data/devices/tz3000-5ity3zyu-ts0121.json +++ b/tests/data/devices/tz3000-5ity3zyu-ts0121.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b1:82:95:69", "nwk": "0x531B", "manufacturer": "_TZ3000_5ity3zyu", @@ -409,22 +409,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:b1:82:95:69:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:82:95:69", "endpoint_id": 1, "available": true, @@ -457,22 +441,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:82:95:69:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:82:95:69", "endpoint_id": 1, "available": true, @@ -501,22 +469,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:82:95:69:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:82:95:69", "endpoint_id": 1, "available": true, @@ -545,22 +497,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:b1:82:95:69:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:b1:82:95:69", "endpoint_id": 1, "available": true, @@ -588,7 +524,7 @@ "unique_id": "ab:cd:ef:12:b1:82:95:69-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -597,22 +533,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b1:82:95:69:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b1:82:95:69", "endpoint_id": 1, "available": true, @@ -621,7 +541,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -645,22 +565,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b1:82:95:69:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b1:82:95:69", "endpoint_id": 1, "available": true, @@ -693,22 +597,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b1:82:95:69:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b1:82:95:69", "endpoint_id": 1, "available": true, @@ -743,22 +631,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:b1:82:95:69:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b1:82:95:69", "endpoint_id": 1, "available": true, @@ -787,22 +659,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b1:82:95:69:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:82:95:69", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-6l1pjfqe-ts011f.json b/tests/data/devices/tz3000-6l1pjfqe-ts011f.json index a1465ff3e..ce24e413a 100644 --- a/tests/data/devices/tz3000-6l1pjfqe-ts011f.json +++ b/tests/data/devices/tz3000-6l1pjfqe-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8e:a1:83:54", "nwk": "0xEC7A", "manufacturer": "_TZ3000_6l1pjfqe", @@ -482,22 +482,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:8e:a1:83:54:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8e:a1:83:54", "endpoint_id": 1, "available": true, @@ -530,22 +514,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8e:a1:83:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8e:a1:83:54", "endpoint_id": 1, "available": true, @@ -574,22 +542,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8e:a1:83:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8e:a1:83:54", "endpoint_id": 1, "available": true, @@ -609,7 +561,7 @@ "unique_id": "ab:cd:ef:12:8e:a1:83:54-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -618,22 +570,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:8e:a1:83:54:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:8e:a1:83:54", "endpoint_id": 1, "available": true, @@ -642,7 +578,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 0.23, "device_type": "Electric Metering", @@ -661,7 +597,7 @@ "unique_id": "ab:cd:ef:12:8e:a1:83:54-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -670,22 +606,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8e:a1:83:54:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8e:a1:83:54", "endpoint_id": 1, "available": true, @@ -694,7 +614,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 450.0 }, @@ -718,22 +638,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8e:a1:83:54:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8e:a1:83:54", "endpoint_id": 1, "available": true, @@ -766,22 +670,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8e:a1:83:54:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8e:a1:83:54", "endpoint_id": 1, "available": true, @@ -816,22 +704,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:8e:a1:83:54:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:8e:a1:83:54", "endpoint_id": 1, "available": true, @@ -860,22 +732,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8e:a1:83:54:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8e:a1:83:54", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-8nkb7mof-ts0121.json b/tests/data/devices/tz3000-8nkb7mof-ts0121.json index 4834d282c..014690358 100644 --- a/tests/data/devices/tz3000-8nkb7mof-ts0121.json +++ b/tests/data/devices/tz3000-8nkb7mof-ts0121.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2d:82:f3:92", "nwk": "0x20AA", "manufacturer": "_TZ3000_8nkb7mof", @@ -458,22 +458,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, @@ -506,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, @@ -554,22 +522,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, @@ -604,22 +556,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, @@ -648,22 +584,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, @@ -692,22 +612,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, @@ -735,7 +639,7 @@ "unique_id": "ab:cd:ef:12:2d:82:f3:92-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -744,22 +648,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, @@ -768,7 +656,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 152.0 }, @@ -792,22 +680,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, @@ -840,22 +712,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, @@ -890,22 +746,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, @@ -932,22 +772,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, @@ -982,22 +806,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:2d:82:f3:92:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2d:82:f3:92", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-8nyaanzb-ts011f.json b/tests/data/devices/tz3000-8nyaanzb-ts011f.json index 1e30bf7c4..c410000eb 100644 --- a/tests/data/devices/tz3000-8nyaanzb-ts011f.json +++ b/tests/data/devices/tz3000-8nyaanzb-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:0e:7a:44:0d", "nwk": "0x18FE", "manufacturer": "_TZ3000_8nyaanzb", @@ -275,22 +275,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:0e:7a:44:0d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:7a:44:0d", "endpoint_id": 1, "available": true, @@ -323,22 +307,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0e:7a:44:0d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:7a:44:0d", "endpoint_id": 1, "available": true, @@ -367,22 +335,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0e:7a:44:0d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:7a:44:0d", "endpoint_id": 1, "available": true, @@ -413,22 +365,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:0e:7a:44:0d:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0e:7a:44:0d", "endpoint_id": 1, "available": true, @@ -455,22 +391,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:0e:7a:44:0d:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0e:7a:44:0d", "endpoint_id": 2, "available": true, @@ -499,22 +419,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:0e:7a:44:0d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0e:7a:44:0d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-8yhypbo7-ts0203.json b/tests/data/devices/tz3000-8yhypbo7-ts0203.json index 53e421a22..13bedb8b1 100644 --- a/tests/data/devices/tz3000-8yhypbo7-ts0203.json +++ b/tests/data/devices/tz3000-8yhypbo7-ts0203.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:01:fb:fa:59:2b", "nwk": "0x7440", "manufacturer": "_TZ3000_8yhypbo7", @@ -236,22 +236,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "a4:c1:38:01:fb:fa:59:2b:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:01:fb:fa:59:2b", "endpoint_id": 1, "available": true, @@ -279,22 +263,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "a4:c1:38:01:fb:fa:59:2b:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:01:fb:fa:59:2b", "endpoint_id": 1, "available": true, @@ -324,22 +292,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "a4:c1:38:01:fb:fa:59:2b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:01:fb:fa:59:2b", "endpoint_id": 1, "available": true, @@ -372,22 +324,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:01:fb:fa:59:2b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:01:fb:fa:59:2b", "endpoint_id": 1, "available": true, @@ -416,22 +352,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:01:fb:fa:59:2b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:01:fb:fa:59:2b", "endpoint_id": 1, "available": true, @@ -460,22 +380,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "a4:c1:38:01:fb:fa:59:2b:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "a4:c1:38:01:fb:fa:59:2b", "endpoint_id": 1, "available": true, @@ -512,22 +416,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "a4:c1:38:01:fb:fa:59:2b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:01:fb:fa:59:2b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-a37eix1s-ts0004.json b/tests/data/devices/tz3000-a37eix1s-ts0004.json index d906f30c8..18ce0ac73 100644 --- a/tests/data/devices/tz3000-a37eix1s-ts0004.json +++ b/tests/data/devices/tz3000-a37eix1s-ts0004.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:83:aa:51:5f", "nwk": "0xD6FB", "manufacturer": "_TZ3000_a37eix1s", @@ -371,22 +371,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:83:aa:51:5f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:83:aa:51:5f", "endpoint_id": 1, "available": true, @@ -419,22 +403,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:83:aa:51:5f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:83:aa:51:5f", "endpoint_id": 1, "available": true, @@ -485,22 +453,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:83:aa:51:5f:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:83:aa:51:5f", "endpoint_id": 2, "available": true, @@ -551,22 +503,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:83:aa:51:5f:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:83:aa:51:5f", "endpoint_id": 3, "available": true, @@ -617,22 +553,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:83:aa:51:5f:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:83:aa:51:5f", "endpoint_id": 4, "available": true, @@ -685,22 +605,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:83:aa:51:5f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:83:aa:51:5f", "endpoint_id": 1, "available": true, @@ -729,22 +633,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:83:aa:51:5f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:83:aa:51:5f", "endpoint_id": 1, "available": true, @@ -775,22 +663,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:83:aa:51:5f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:83:aa:51:5f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-a9buwvb7-ts0726.json b/tests/data/devices/tz3000-a9buwvb7-ts0726.json index 2f83b0460..f529abda3 100644 --- a/tests/data/devices/tz3000-a9buwvb7-ts0726.json +++ b/tests/data/devices/tz3000-a9buwvb7-ts0726.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:97:a3:66:bf", "nwk": "0x407B", "manufacturer": "_TZ3000_a9buwvb7", @@ -574,22 +574,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:97:a3:66:bf:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:a3:66:bf", "endpoint_id": 1, "available": true, @@ -622,22 +606,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:97:a3:66:bf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:a3:66:bf", "endpoint_id": 1, "available": true, @@ -666,22 +634,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:97:a3:66:bf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:a3:66:bf", "endpoint_id": 1, "available": true, @@ -712,22 +664,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:97:a3:66:bf:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:97:a3:66:bf", "endpoint_id": 1, "available": true, @@ -754,22 +690,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:97:a3:66:bf:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:97:a3:66:bf", "endpoint_id": 2, "available": true, @@ -796,22 +716,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:97:a3:66:bf:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:97:a3:66:bf", "endpoint_id": 3, "available": true, @@ -838,22 +742,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:97:a3:66:bf:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:97:a3:66:bf", "endpoint_id": 4, "available": true, @@ -880,22 +768,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 5, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "5:0x0006", - "unique_id": "ab:cd:ef:12:97:a3:66:bf:5:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:97:a3:66:bf", "endpoint_id": 5, "available": true, @@ -922,22 +794,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 6, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "6:0x0006", - "unique_id": "ab:cd:ef:12:97:a3:66:bf:6:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:97:a3:66:bf", "endpoint_id": 6, "available": true, @@ -966,22 +822,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:97:a3:66:bf:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:a3:66:bf", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-adkvzooy-ts0042.json b/tests/data/devices/tz3000-adkvzooy-ts0042.json index ac7d41a17..7b28ca869 100644 --- a/tests/data/devices/tz3000-adkvzooy-ts0042.json +++ b/tests/data/devices/tz3000-adkvzooy-ts0042.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1b:0a:cb:cb", "nwk": "0x133E", "manufacturer": "_TZ3000_adkvzooy", @@ -164,22 +164,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1b:0a:cb:cb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:0a:cb:cb", "endpoint_id": 1, "available": true, @@ -208,22 +192,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1b:0a:cb:cb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:0a:cb:cb", "endpoint_id": 1, "available": true, @@ -252,22 +220,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:1b:0a:cb:cb:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:1b:0a:cb:cb", "endpoint_id": 1, "available": true, @@ -301,22 +253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "ab:cd:ef:12:1b:0a:cb:cb:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:1b:0a:cb:cb", "endpoint_id": 2, "available": true, @@ -352,22 +288,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:1b:0a:cb:cb:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1b:0a:cb:cb", "endpoint_id": 1, "available": true, @@ -394,22 +314,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:1b:0a:cb:cb:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1b:0a:cb:cb", "endpoint_id": 2, "available": true, @@ -438,22 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1b:0a:cb:cb:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:0a:cb:cb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-aghwaexm-ts0001.json b/tests/data/devices/tz3000-aghwaexm-ts0001.json index b56ea8f12..e8af227c6 100644 --- a/tests/data/devices/tz3000-aghwaexm-ts0001.json +++ b/tests/data/devices/tz3000-aghwaexm-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a9:d3:9f:ef", "nwk": "0x30C0", "manufacturer": "_TZ3000_aghwaexm", @@ -166,22 +166,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:a9:d3:9f:ef:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:d3:9f:ef", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:a9:d3:9f:ef:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a9:d3:9f:ef", "endpoint_id": 1, "available": true, @@ -282,22 +250,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a9:d3:9f:ef:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:d3:9f:ef", "endpoint_id": 1, "available": true, @@ -326,22 +278,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a9:d3:9f:ef:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:d3:9f:ef", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-bgsigers-ts0201.json b/tests/data/devices/tz3000-bgsigers-ts0201.json index c8b065015..cd38d0787 100644 --- a/tests/data/devices/tz3000-bgsigers-ts0201.json +++ b/tests/data/devices/tz3000-bgsigers-ts0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:54:ee:e3:19", "nwk": "0x7FAD", "manufacturer": "_TZ3000_bgsigers", @@ -199,22 +199,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:54:ee:e3:19:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:54:ee:e3:19", "endpoint_id": 1, "available": true, @@ -247,22 +231,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:54:ee:e3:19:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:54:ee:e3:19", "endpoint_id": 1, "available": true, @@ -291,22 +259,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:54:ee:e3:19:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:54:ee:e3:19", "endpoint_id": 1, "available": true, @@ -335,22 +287,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:54:ee:e3:19:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:54:ee:e3:19", "endpoint_id": 1, "available": true, @@ -385,22 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:54:ee:e3:19:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:54:ee:e3:19", "endpoint_id": 1, "available": true, @@ -429,22 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:54:ee:e3:19:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:54:ee:e3:19", "endpoint_id": 1, "available": true, @@ -475,22 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:54:ee:e3:19:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:54:ee:e3:19", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-bguser20-ts0201.json b/tests/data/devices/tz3000-bguser20-ts0201.json index 949915322..8998241b8 100644 --- a/tests/data/devices/tz3000-bguser20-ts0201.json +++ b/tests/data/devices/tz3000-bguser20-ts0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:55:4f:a5:d8:b1", "nwk": "0xBF7D", "manufacturer": "_TZ3000_bguser20", @@ -199,22 +199,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "a4:c1:38:55:4f:a5:d8:b1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:55:4f:a5:d8:b1", "endpoint_id": 1, "available": true, @@ -247,22 +231,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:55:4f:a5:d8:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:55:4f:a5:d8:b1", "endpoint_id": 1, "available": true, @@ -291,22 +259,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:55:4f:a5:d8:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:55:4f:a5:d8:b1", "endpoint_id": 1, "available": true, @@ -335,22 +287,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "a4:c1:38:55:4f:a5:d8:b1:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "a4:c1:38:55:4f:a5:d8:b1", "endpoint_id": 1, "available": true, @@ -385,22 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "a4:c1:38:55:4f:a5:d8:b1:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:55:4f:a5:d8:b1", "endpoint_id": 1, "available": true, @@ -429,22 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "a4:c1:38:55:4f:a5:d8:b1:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:55:4f:a5:d8:b1", "endpoint_id": 1, "available": true, @@ -475,22 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "a4:c1:38:55:4f:a5:d8:b1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:55:4f:a5:d8:b1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-bjawzodf-ty0201.json b/tests/data/devices/tz3000-bjawzodf-ty0201.json index 6d62e1f0e..37b341f08 100644 --- a/tests/data/devices/tz3000-bjawzodf-ty0201.json +++ b/tests/data/devices/tz3000-bjawzodf-ty0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2b:57:26:74", "nwk": "0xF9BF", "manufacturer": "_TZ3000_bjawzodf", @@ -180,22 +180,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:2b:57:26:74:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2b:57:26:74", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2b:57:26:74:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2b:57:26:74", "endpoint_id": 1, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2b:57:26:74:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2b:57:26:74", "endpoint_id": 1, "available": true, @@ -316,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:2b:57:26:74:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:2b:57:26:74", "endpoint_id": 1, "available": true, @@ -367,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:2b:57:26:74:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:2b:57:26:74", "endpoint_id": 1, "available": true, @@ -413,22 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:2b:57:26:74:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2b:57:26:74", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-cehuw1lw-ts011f.json b/tests/data/devices/tz3000-cehuw1lw-ts011f.json index 655b47006..3f7a3f53e 100644 --- a/tests/data/devices/tz3000-cehuw1lw-ts011f.json +++ b/tests/data/devices/tz3000-cehuw1lw-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2d:f8:5e:65", "nwk": "0x1F7A", "manufacturer": "_TZ3000_cehuw1lw", @@ -451,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:2d:f8:5e:65:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2d:f8:5e:65", "endpoint_id": 1, "available": true, @@ -499,22 +483,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2d:f8:5e:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2d:f8:5e:65", "endpoint_id": 1, "available": true, @@ -543,22 +511,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2d:f8:5e:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2d:f8:5e:65", "endpoint_id": 1, "available": true, @@ -578,7 +530,7 @@ "unique_id": "ab:cd:ef:12:2d:f8:5e:65-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -587,22 +539,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:2d:f8:5e:65:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:2d:f8:5e:65", "endpoint_id": 1, "available": true, @@ -611,7 +547,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 1.98, "device_type": "Electric Metering", @@ -630,7 +566,7 @@ "unique_id": "ab:cd:ef:12:2d:f8:5e:65-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -639,22 +575,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2d:f8:5e:65:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2d:f8:5e:65", "endpoint_id": 1, "available": true, @@ -663,7 +583,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -687,22 +607,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2d:f8:5e:65:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2d:f8:5e:65", "endpoint_id": 1, "available": true, @@ -735,22 +639,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2d:f8:5e:65:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2d:f8:5e:65", "endpoint_id": 1, "available": true, @@ -785,22 +673,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:2d:f8:5e:65:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2d:f8:5e:65", "endpoint_id": 1, "available": true, @@ -829,22 +701,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:2d:f8:5e:65:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2d:f8:5e:65", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-cfnprab5-ts011f.json b/tests/data/devices/tz3000-cfnprab5-ts011f.json index ac6c0a9b4..abfad584c 100644 --- a/tests/data/devices/tz3000-cfnprab5-ts011f.json +++ b/tests/data/devices/tz3000-cfnprab5-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:86:cf:95:48", "nwk": "0x329B", "manufacturer": "_TZ3000_cfnprab5", @@ -428,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:86:cf:95:48:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:86:cf:95:48", "endpoint_id": 1, "available": true, @@ -476,22 +460,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:86:cf:95:48:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:86:cf:95:48", "endpoint_id": 1, "available": true, @@ -542,22 +510,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:86:cf:95:48:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:86:cf:95:48", "endpoint_id": 2, "available": true, @@ -608,22 +560,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:86:cf:95:48:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:86:cf:95:48", "endpoint_id": 3, "available": true, @@ -674,22 +610,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:86:cf:95:48:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:86:cf:95:48", "endpoint_id": 4, "available": true, @@ -740,22 +660,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 5, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "5:0x0006", - "unique_id": "ab:cd:ef:12:86:cf:95:48:5:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:86:cf:95:48", "endpoint_id": 5, "available": true, @@ -808,22 +712,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:86:cf:95:48:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:86:cf:95:48", "endpoint_id": 1, "available": true, @@ -852,22 +740,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:86:cf:95:48:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:86:cf:95:48", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-cicwjqth-ts011f.json b/tests/data/devices/tz3000-cicwjqth-ts011f.json index a78664e84..aa87ad495 100644 --- a/tests/data/devices/tz3000-cicwjqth-ts011f.json +++ b/tests/data/devices/tz3000-cicwjqth-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8d:0c:54:33", "nwk": "0x7530", "manufacturer": "_TZ3000_cicwjqth", @@ -445,22 +445,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:8d:0c:54:33:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:0c:54:33", "endpoint_id": 1, "available": true, @@ -493,22 +477,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:0c:54:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:0c:54:33", "endpoint_id": 1, "available": true, @@ -537,22 +505,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:0c:54:33:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:0c:54:33", "endpoint_id": 1, "available": true, @@ -572,7 +524,7 @@ "unique_id": "ab:cd:ef:12:8d:0c:54:33-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -581,22 +533,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8d:0c:54:33:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8d:0c:54:33", "endpoint_id": 1, "available": true, @@ -605,7 +541,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -629,22 +565,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8d:0c:54:33:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8d:0c:54:33", "endpoint_id": 1, "available": true, @@ -677,22 +597,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:8d:0c:54:33:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:8d:0c:54:33", "endpoint_id": 1, "available": true, @@ -727,22 +631,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:8d:0c:54:33:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:8d:0c:54:33", "endpoint_id": 1, "available": true, @@ -771,22 +659,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8d:0c:54:33:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:0c:54:33", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-dbou1ap4-ts0505a.json b/tests/data/devices/tz3000-dbou1ap4-ts0505a.json index 6f2f2a525..53cb7c0c9 100644 --- a/tests/data/devices/tz3000-dbou1ap4-ts0505a.json +++ b/tests/data/devices/tz3000-dbou1ap4-ts0505a.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:90:7f:c5:7a", "nwk": "0xAA8C", "manufacturer": "_TZ3000_dbou1ap4", @@ -316,22 +316,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:90:7f:c5:7a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:7f:c5:7a", "endpoint_id": 1, "available": true, @@ -364,50 +348,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:90:7f:c5:7a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:90:7f:c5:7a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:90:7f:c5:7a:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:90:7f:c5:7a", "endpoint_id": 1, "available": true, @@ -466,22 +406,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:90:7f:c5:7a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:7f:c5:7a", "endpoint_id": 1, "available": true, @@ -510,22 +434,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:90:7f:c5:7a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:7f:c5:7a", "endpoint_id": 1, "available": true, @@ -556,22 +464,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:90:7f:c5:7a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:7f:c5:7a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-dowj6gyi-ts0201.json b/tests/data/devices/tz3000-dowj6gyi-ts0201.json index 752124c9e..d016b87d9 100644 --- a/tests/data/devices/tz3000-dowj6gyi-ts0201.json +++ b/tests/data/devices/tz3000-dowj6gyi-ts0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:51:b2:ae:04", "nwk": "0x95F3", "manufacturer": "_TZ3000_dowj6gyi", @@ -192,22 +192,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:51:b2:ae:04:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:b2:ae:04", "endpoint_id": 1, "available": true, @@ -240,22 +224,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:51:b2:ae:04:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:b2:ae:04", "endpoint_id": 1, "available": true, @@ -284,22 +252,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:51:b2:ae:04:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:b2:ae:04", "endpoint_id": 1, "available": true, @@ -328,22 +280,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:51:b2:ae:04:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:51:b2:ae:04", "endpoint_id": 1, "available": true, @@ -378,22 +314,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:51:b2:ae:04:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:51:b2:ae:04", "endpoint_id": 1, "available": true, @@ -422,22 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:51:b2:ae:04:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:51:b2:ae:04", "endpoint_id": 1, "available": true, @@ -468,22 +372,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:51:b2:ae:04:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:b2:ae:04", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-drc9tuqb-ts0001.json b/tests/data/devices/tz3000-drc9tuqb-ts0001.json index 54320d405..bd49dbeec 100644 --- a/tests/data/devices/tz3000-drc9tuqb-ts0001.json +++ b/tests/data/devices/tz3000-drc9tuqb-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:99:36:0a:01", "nwk": "0xC3DA", "manufacturer": "_TZ3000_drc9tuqb", @@ -243,22 +243,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:99:36:0a:01:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:36:0a:01", "endpoint_id": 1, "available": true, @@ -291,22 +275,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:99:36:0a:01:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:99:36:0a:01", "endpoint_id": 1, "available": true, @@ -359,22 +327,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:99:36:0a:01:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:99:36:0a:01", "endpoint_id": 1, "available": true, @@ -407,22 +359,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:99:36:0a:01:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:99:36:0a:01", "endpoint_id": 1, "available": true, @@ -457,22 +393,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:99:36:0a:01:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:36:0a:01", "endpoint_id": 1, "available": true, @@ -501,22 +421,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:99:36:0a:01:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:36:0a:01", "endpoint_id": 1, "available": true, @@ -547,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:99:36:0a:01:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:36:0a:01", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-e2uieqop-ts0001.json b/tests/data/devices/tz3000-e2uieqop-ts0001.json index 221da68e5..ff40a7ad5 100644 --- a/tests/data/devices/tz3000-e2uieqop-ts0001.json +++ b/tests/data/devices/tz3000-e2uieqop-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:db:a7:b4:b5", "nwk": "0xCBB7", "manufacturer": "_TZ3000_e2uieqop", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:db:a7:b4:b5:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:db:a7:b4:b5", "endpoint_id": 1, "available": true, @@ -269,22 +253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:db:a7:b4:b5:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:db:a7:b4:b5", "endpoint_id": 1, "available": true, @@ -337,22 +305,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:db:a7:b4:b5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:db:a7:b4:b5", "endpoint_id": 1, "available": true, @@ -381,22 +333,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:db:a7:b4:b5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:db:a7:b4:b5", "endpoint_id": 1, "available": true, @@ -427,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:db:a7:b4:b5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:db:a7:b4:b5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-eamtuojw-ts0201.json b/tests/data/devices/tz3000-eamtuojw-ts0201.json index 3d495442d..b1d6a8c07 100644 --- a/tests/data/devices/tz3000-eamtuojw-ts0201.json +++ b/tests/data/devices/tz3000-eamtuojw-ts0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ab:fc:51:44", "nwk": "0x8AFE", "manufacturer": "_TZ3000_eamtuojw", @@ -187,22 +187,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ab:fc:51:44:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:fc:51:44", "endpoint_id": 1, "available": true, @@ -231,22 +215,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ab:fc:51:44:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:fc:51:44", "endpoint_id": 1, "available": true, @@ -275,22 +243,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:ab:fc:51:44:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:ab:fc:51:44", "endpoint_id": 1, "available": true, @@ -325,22 +277,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:ab:fc:51:44:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:ab:fc:51:44", "endpoint_id": 1, "available": true, @@ -369,22 +305,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:ab:fc:51:44:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:ab:fc:51:44", "endpoint_id": 1, "available": true, @@ -415,22 +335,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ab:fc:51:44:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:fc:51:44", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-empogkya-ts0003.json b/tests/data/devices/tz3000-empogkya-ts0003.json index 6c59a190a..dc6ad4f16 100644 --- a/tests/data/devices/tz3000-empogkya-ts0003.json +++ b/tests/data/devices/tz3000-empogkya-ts0003.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a4:f0:2a:e8", "nwk": "0x5407", "manufacturer": "_TZ3000_empogkya", @@ -311,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:a4:f0:2a:e8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a4:f0:2a:e8", "endpoint_id": 1, "available": true, @@ -359,22 +343,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:a4:f0:2a:e8:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a4:f0:2a:e8", "endpoint_id": 1, "available": true, @@ -425,22 +393,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:a4:f0:2a:e8:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a4:f0:2a:e8", "endpoint_id": 2, "available": true, @@ -491,22 +443,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:a4:f0:2a:e8:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a4:f0:2a:e8", "endpoint_id": 3, "available": true, @@ -559,22 +495,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a4:f0:2a:e8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a4:f0:2a:e8", "endpoint_id": 1, "available": true, @@ -603,22 +523,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a4:f0:2a:e8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a4:f0:2a:e8", "endpoint_id": 1, "available": true, @@ -649,22 +553,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a4:f0:2a:e8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a4:f0:2a:e8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-f2bw0b6k-ts0201.json b/tests/data/devices/tz3000-f2bw0b6k-ts0201.json index 42e8c138d..ac9d7df1a 100644 --- a/tests/data/devices/tz3000-f2bw0b6k-ts0201.json +++ b/tests/data/devices/tz3000-f2bw0b6k-ts0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:56:3c:3e:d9:f0", "nwk": "0xE2A4", "manufacturer": "_TZ3000_f2bw0b6k", @@ -199,22 +199,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "a4:c1:38:56:3c:3e:d9:f0:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:56:3c:3e:d9:f0", "endpoint_id": 1, "available": true, @@ -247,22 +231,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:56:3c:3e:d9:f0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:56:3c:3e:d9:f0", "endpoint_id": 1, "available": true, @@ -291,22 +259,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:56:3c:3e:d9:f0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:56:3c:3e:d9:f0", "endpoint_id": 1, "available": true, @@ -335,22 +287,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "a4:c1:38:56:3c:3e:d9:f0:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "a4:c1:38:56:3c:3e:d9:f0", "endpoint_id": 1, "available": true, @@ -385,22 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "a4:c1:38:56:3c:3e:d9:f0:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:56:3c:3e:d9:f0", "endpoint_id": 1, "available": true, @@ -429,22 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "a4:c1:38:56:3c:3e:d9:f0:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:56:3c:3e:d9:f0", "endpoint_id": 1, "available": true, @@ -475,22 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "a4:c1:38:56:3c:3e:d9:f0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:56:3c:3e:d9:f0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-famkxci2-ts0043.json b/tests/data/devices/tz3000-famkxci2-ts0043.json index 1659b43c2..982ff1941 100644 --- a/tests/data/devices/tz3000-famkxci2-ts0043.json +++ b/tests/data/devices/tz3000-famkxci2-ts0043.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c2:cb:44:9b", "nwk": "0x38A8", "manufacturer": "_TZ3000_famkxci2", @@ -277,22 +277,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c2:cb:44:9b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c2:cb:44:9b", "endpoint_id": 1, "available": true, @@ -321,22 +305,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c2:cb:44:9b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c2:cb:44:9b", "endpoint_id": 1, "available": true, @@ -365,22 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:c2:cb:44:9b:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:c2:cb:44:9b", "endpoint_id": 1, "available": true, @@ -415,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "ab:cd:ef:12:c2:cb:44:9b:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:c2:cb:44:9b", "endpoint_id": 2, "available": true, @@ -465,22 +401,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 3, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "3:0x0001", - "unique_id": "ab:cd:ef:12:c2:cb:44:9b:3:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:c2:cb:44:9b", "endpoint_id": 3, "available": true, @@ -517,22 +437,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c2:cb:44:9b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c2:cb:44:9b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-fdxihpp7-ts0001.json b/tests/data/devices/tz3000-fdxihpp7-ts0001.json index 3faead9e1..badc35f33 100644 --- a/tests/data/devices/tz3000-fdxihpp7-ts0001.json +++ b/tests/data/devices/tz3000-fdxihpp7-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:22:a7:1c:c8", "nwk": "0xC86B", "manufacturer": "_TZ3000_fdxihpp7", @@ -484,22 +484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:22:a7:1c:c8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:a7:1c:c8", "endpoint_id": 1, "available": true, @@ -532,22 +516,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:22:a7:1c:c8:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:22:a7:1c:c8", "endpoint_id": 1, "available": true, @@ -600,22 +568,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:a7:1c:c8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:a7:1c:c8", "endpoint_id": 1, "available": true, @@ -644,22 +596,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:a7:1c:c8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:a7:1c:c8", "endpoint_id": 1, "available": true, @@ -688,22 +624,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:22:a7:1c:c8:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:22:a7:1c:c8", "endpoint_id": 1, "available": true, @@ -729,7 +649,7 @@ "unique_id": "ab:cd:ef:12:22:a7:1c:c8-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -738,22 +658,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:22:a7:1c:c8:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:a7:1c:c8", "endpoint_id": 1, "available": true, @@ -762,7 +666,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -786,22 +690,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:22:a7:1c:c8:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:a7:1c:c8", "endpoint_id": 1, "available": true, @@ -834,22 +722,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:22:a7:1c:c8:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:a7:1c:c8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-gbm10jnj-ts0043.json b/tests/data/devices/tz3000-gbm10jnj-ts0043.json index f6e5d7f08..7d0217072 100644 --- a/tests/data/devices/tz3000-gbm10jnj-ts0043.json +++ b/tests/data/devices/tz3000-gbm10jnj-ts0043.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f1:51:0b:5a", "nwk": "0x3F05", "manufacturer": "_TZ3000_gbm10jnj", @@ -281,22 +281,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f1:51:0b:5a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:51:0b:5a", "endpoint_id": 1, "available": true, @@ -325,22 +309,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f1:51:0b:5a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:51:0b:5a", "endpoint_id": 1, "available": true, @@ -369,22 +337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:f1:51:0b:5a:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:f1:51:0b:5a", "endpoint_id": 1, "available": true, @@ -419,22 +371,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "ab:cd:ef:12:f1:51:0b:5a:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:f1:51:0b:5a", "endpoint_id": 2, "available": true, @@ -469,22 +405,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 3, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "3:0x0001", - "unique_id": "ab:cd:ef:12:f1:51:0b:5a:3:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:f1:51:0b:5a", "endpoint_id": 3, "available": true, @@ -521,22 +441,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:f1:51:0b:5a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f1:51:0b:5a", "endpoint_id": 1, "available": true, @@ -563,22 +467,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:f1:51:0b:5a:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f1:51:0b:5a", "endpoint_id": 2, "available": true, @@ -605,22 +493,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:f1:51:0b:5a:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f1:51:0b:5a", "endpoint_id": 3, "available": true, @@ -649,22 +521,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f1:51:0b:5a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:51:0b:5a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-gjpgagal-ts0049.json b/tests/data/devices/tz3000-gjpgagal-ts0049.json index e3a4e8019..b0ea1a76f 100644 --- a/tests/data/devices/tz3000-gjpgagal-ts0049.json +++ b/tests/data/devices/tz3000-gjpgagal-ts0049.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:eb:a9:5b:37", "nwk": "0xC30D", "manufacturer": "_TZ3000_gjpgagal", @@ -216,22 +216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:eb:a9:5b:37:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:a9:5b:37", "endpoint_id": 1, "available": true, @@ -264,22 +248,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:eb:a9:5b:37:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:a9:5b:37", "endpoint_id": 1, "available": true, @@ -308,22 +276,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:eb:a9:5b:37:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:a9:5b:37", "endpoint_id": 1, "available": true, @@ -352,22 +304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:eb:a9:5b:37:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:eb:a9:5b:37", "endpoint_id": 1, "available": true, @@ -404,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:eb:a9:5b:37:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:eb:a9:5b:37", "endpoint_id": 1, "available": true, @@ -448,22 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:eb:a9:5b:37:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:a9:5b:37", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-gjrubzje-ts0001.json b/tests/data/devices/tz3000-gjrubzje-ts0001.json index ac3ad556c..6a3a6984b 100644 --- a/tests/data/devices/tz3000-gjrubzje-ts0001.json +++ b/tests/data/devices/tz3000-gjrubzje-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6b:b2:ef:b7", "nwk": "0xAD94", "manufacturer": "_TZ3000_gjrubzje", @@ -432,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:6b:b2:ef:b7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:b2:ef:b7", "endpoint_id": 1, "available": true, @@ -480,22 +464,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:6b:b2:ef:b7:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:6b:b2:ef:b7", "endpoint_id": 1, "available": true, @@ -548,22 +516,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6b:b2:ef:b7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:b2:ef:b7", "endpoint_id": 1, "available": true, @@ -592,22 +544,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6b:b2:ef:b7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:b2:ef:b7", "endpoint_id": 1, "available": true, @@ -636,22 +572,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:6b:b2:ef:b7:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:6b:b2:ef:b7", "endpoint_id": 1, "available": true, @@ -679,7 +599,7 @@ "unique_id": "ab:cd:ef:12:6b:b2:ef:b7-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -688,22 +608,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:6b:b2:ef:b7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:6b:b2:ef:b7", "endpoint_id": 1, "available": true, @@ -712,7 +616,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -736,22 +640,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:6b:b2:ef:b7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:6b:b2:ef:b7", "endpoint_id": 1, "available": true, @@ -783,22 +671,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:6b:b2:ef:b7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:6b:b2:ef:b7", "endpoint_id": 1, "available": true, @@ -831,22 +703,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:6b:b2:ef:b7:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:6b:b2:ef:b7", "endpoint_id": 1, "available": true, @@ -881,22 +737,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6b:b2:ef:b7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:b2:ef:b7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-gwkzibhs-ts004f.json b/tests/data/devices/tz3000-gwkzibhs-ts004f.json index 87979080f..2da4664ae 100644 --- a/tests/data/devices/tz3000-gwkzibhs-ts004f.json +++ b/tests/data/devices/tz3000-gwkzibhs-ts004f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e5:79:a6:00", "nwk": "0x4108", "manufacturer": "_TZ3000_gwkzibhs", @@ -252,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e5:79:a6:00:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:79:a6:00", "endpoint_id": 1, "available": true, @@ -300,22 +284,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e5:79:a6:00:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:79:a6:00", "endpoint_id": 1, "available": true, @@ -344,22 +312,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e5:79:a6:00:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:79:a6:00", "endpoint_id": 1, "available": true, @@ -388,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:e5:79:a6:00:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:e5:79:a6:00", "endpoint_id": 1, "available": true, @@ -440,22 +376,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e5:79:a6:00:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:79:a6:00", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-hafsqare-ts0011.json b/tests/data/devices/tz3000-hafsqare-ts0011.json index 3f8cb08b4..01791ea72 100644 --- a/tests/data/devices/tz3000-hafsqare-ts0011.json +++ b/tests/data/devices/tz3000-hafsqare-ts0011.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:bd:23:09:5e", "nwk": "0xDAA8", "manufacturer": "_TZ3000_hafsqare", @@ -197,22 +197,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:bd:23:09:5e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bd:23:09:5e", "endpoint_id": 1, "available": true, @@ -245,22 +229,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bd:23:09:5e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bd:23:09:5e", "endpoint_id": 1, "available": true, @@ -289,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bd:23:09:5e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bd:23:09:5e", "endpoint_id": 1, "available": true, @@ -335,22 +287,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:bd:23:09:5e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:bd:23:09:5e", "endpoint_id": 1, "available": true, @@ -379,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:bd:23:09:5e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bd:23:09:5e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-idhkkbqj-ts0012.json b/tests/data/devices/tz3000-idhkkbqj-ts0012.json index f4722340e..33bea50c3 100644 --- a/tests/data/devices/tz3000-idhkkbqj-ts0012.json +++ b/tests/data/devices/tz3000-idhkkbqj-ts0012.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b1:1b:a9:d3", "nwk": "0x6A19", "manufacturer": "_TZ3000_idhkkbqj", @@ -264,22 +264,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:b1:1b:a9:d3:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b1:1b:a9:d3", "endpoint_id": 1, "available": true, @@ -330,22 +314,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:b1:1b:a9:d3:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b1:1b:a9:d3", "endpoint_id": 2, "available": true, @@ -398,22 +366,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:1b:a9:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:1b:a9:d3", "endpoint_id": 1, "available": true, @@ -442,22 +394,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:1b:a9:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:1b:a9:d3", "endpoint_id": 1, "available": true, @@ -488,22 +424,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b1:1b:a9:d3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:1b:a9:d3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-isw9u95y-ts0201.json b/tests/data/devices/tz3000-isw9u95y-ts0201.json index dc31c3151..1ceee8177 100644 --- a/tests/data/devices/tz3000-isw9u95y-ts0201.json +++ b/tests/data/devices/tz3000-isw9u95y-ts0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ca:ae:e5:84", "nwk": "0x2D2E", "manufacturer": "_TZ3000_isw9u95y", @@ -252,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:ca:ae:e5:84:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:ae:e5:84", "endpoint_id": 1, "available": true, @@ -297,22 +281,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ca:ae:e5:84:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:ae:e5:84", "endpoint_id": 1, "available": true, @@ -345,22 +313,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ca:ae:e5:84:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:ae:e5:84", "endpoint_id": 1, "available": true, @@ -389,22 +341,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ca:ae:e5:84:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:ae:e5:84", "endpoint_id": 1, "available": true, @@ -433,22 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:ca:ae:e5:84:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:ca:ae:e5:84", "endpoint_id": 1, "available": true, @@ -483,22 +403,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:ca:ae:e5:84:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:ca:ae:e5:84", "endpoint_id": 1, "available": true, @@ -527,22 +431,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:ca:ae:e5:84:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:ca:ae:e5:84", "endpoint_id": 1, "available": true, @@ -571,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:ca:ae:e5:84:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:ca:ae:e5:84", "endpoint_id": 1, "available": true, @@ -617,22 +489,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ca:ae:e5:84:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ca:ae:e5:84", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-itnrsufe-ts0201.json b/tests/data/devices/tz3000-itnrsufe-ts0201.json index 9a12bf234..7f132e340 100644 --- a/tests/data/devices/tz3000-itnrsufe-ts0201.json +++ b/tests/data/devices/tz3000-itnrsufe-ts0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:fe:e0:5d:44:91", "nwk": "0xEB7A", "manufacturer": "_TZ3000_itnrsufe", @@ -205,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "a4:c1:38:fe:e0:5d:44:91:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:fe:e0:5d:44:91", "endpoint_id": 1, "available": true, @@ -253,22 +237,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:fe:e0:5d:44:91:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:fe:e0:5d:44:91", "endpoint_id": 1, "available": true, @@ -297,22 +265,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:fe:e0:5d:44:91:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:fe:e0:5d:44:91", "endpoint_id": 1, "available": true, @@ -341,22 +293,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "a4:c1:38:fe:e0:5d:44:91:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "a4:c1:38:fe:e0:5d:44:91", "endpoint_id": 1, "available": true, @@ -391,22 +327,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "a4:c1:38:fe:e0:5d:44:91:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:fe:e0:5d:44:91", "endpoint_id": 1, "available": true, @@ -435,22 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "a4:c1:38:fe:e0:5d:44:91:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:fe:e0:5d:44:91", "endpoint_id": 1, "available": true, @@ -481,22 +385,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "a4:c1:38:fe:e0:5d:44:91:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:fe:e0:5d:44:91", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-j1xl73iw-ts130f.json b/tests/data/devices/tz3000-j1xl73iw-ts130f.json index 7cffd8474..527d9c2f0 100644 --- a/tests/data/devices/tz3000-j1xl73iw-ts130f.json +++ b/tests/data/devices/tz3000-j1xl73iw-ts130f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e2:fe:70:54", "nwk": "0x8B1B", "manufacturer": "_TZ3000_j1xl73iw", @@ -433,22 +433,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:e2:fe:70:54:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:e2:fe:70:54", "endpoint_id": 1, "available": true, @@ -481,22 +465,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 2, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "2:0x0102", - "unique_id": "ab:cd:ef:12:e2:fe:70:54:2:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:e2:fe:70:54", "endpoint_id": 2, "available": true, @@ -531,22 +499,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e2:fe:70:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e2:fe:70:54", "endpoint_id": 1, "available": true, @@ -575,22 +527,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e2:fe:70:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e2:fe:70:54", "endpoint_id": 1, "available": true, @@ -621,22 +557,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e2:fe:70:54:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e2:fe:70:54", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-ja5osu5g-ts004f.json b/tests/data/devices/tz3000-ja5osu5g-ts004f.json index 808507a60..b605cc3fb 100644 --- a/tests/data/devices/tz3000-ja5osu5g-ts004f.json +++ b/tests/data/devices/tz3000-ja5osu5g-ts004f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a9:50:bd:12", "nwk": "0x15CB", "manufacturer": "_TZ3000_ja5osu5g", @@ -252,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:a9:50:bd:12:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:50:bd:12", "endpoint_id": 1, "available": true, @@ -300,22 +284,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a9:50:bd:12:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:50:bd:12", "endpoint_id": 1, "available": true, @@ -344,22 +312,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a9:50:bd:12:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:50:bd:12", "endpoint_id": 1, "available": true, @@ -388,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:a9:50:bd:12:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:a9:50:bd:12", "endpoint_id": 1, "available": true, @@ -440,22 +376,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a9:50:bd:12:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:50:bd:12", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-kjfzuycl-ts004f.json b/tests/data/devices/tz3000-kjfzuycl-ts004f.json index c2e05004c..fd62b6e33 100644 --- a/tests/data/devices/tz3000-kjfzuycl-ts004f.json +++ b/tests/data/devices/tz3000-kjfzuycl-ts004f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "38:5b:44:ff:fe:36:af:0f", "nwk": "0x0880", "manufacturer": "_TZ3000_kjfzuycl", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "38:5b:44:ff:fe:36:af:0f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "38:5b:44:ff:fe:36:af:0f", "endpoint_id": 1, "available": true, @@ -269,22 +253,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "38:5b:44:ff:fe:36:af:0f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "38:5b:44:ff:fe:36:af:0f", "endpoint_id": 1, "available": true, @@ -313,22 +281,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "38:5b:44:ff:fe:36:af:0f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "38:5b:44:ff:fe:36:af:0f", "endpoint_id": 1, "available": true, @@ -357,22 +309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "38:5b:44:ff:fe:36:af:0f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "38:5b:44:ff:fe:36:af:0f", "endpoint_id": 1, "available": true, @@ -409,22 +345,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "38:5b:44:ff:fe:36:af:0f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "38:5b:44:ff:fe:36:af:0f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-kmsbwdol-ts130f.json b/tests/data/devices/tz3000-kmsbwdol-ts130f.json index 070244a04..01f7de633 100644 --- a/tests/data/devices/tz3000-kmsbwdol-ts130f.json +++ b/tests/data/devices/tz3000-kmsbwdol-ts130f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8d:b7:7a:50", "nwk": "0x7224", "manufacturer": "_TZ3000_kmsbwdol", @@ -355,22 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:8d:b7:7a:50:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:8d:b7:7a:50", "endpoint_id": 1, "available": true, @@ -403,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 2, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "2:0x0102", - "unique_id": "ab:cd:ef:12:8d:b7:7a:50:2:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:8d:b7:7a:50", "endpoint_id": 2, "available": true, @@ -453,22 +421,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:b7:7a:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:b7:7a:50", "endpoint_id": 1, "available": true, @@ -497,22 +449,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:b7:7a:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:b7:7a:50", "endpoint_id": 1, "available": true, @@ -541,22 +477,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 2, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "2:0x0102", - "unique_id": "ab:cd:ef:12:8d:b7:7a:50:2:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:8d:b7:7a:50", "endpoint_id": 2, "available": true, @@ -587,22 +507,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8d:b7:7a:50:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:b7:7a:50", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-kqvb5akv-ts0001.json b/tests/data/devices/tz3000-kqvb5akv-ts0001.json index 398a41669..b1da12238 100644 --- a/tests/data/devices/tz3000-kqvb5akv-ts0001.json +++ b/tests/data/devices/tz3000-kqvb5akv-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c3:82:cb:22", "nwk": "0xDB0A", "manufacturer": "_TZ3000_kqvb5akv", @@ -553,22 +553,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:c3:82:cb:22:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:82:cb:22", "endpoint_id": 1, "available": true, @@ -601,22 +585,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:c3:82:cb:22:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:c3:82:cb:22", "endpoint_id": 1, "available": true, @@ -669,22 +637,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c3:82:cb:22:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:82:cb:22", "endpoint_id": 1, "available": true, @@ -713,22 +665,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c3:82:cb:22:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:82:cb:22", "endpoint_id": 1, "available": true, @@ -757,22 +693,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "CustomMetering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:c3:82:cb:22:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:c3:82:cb:22", "endpoint_id": 1, "available": true, @@ -800,7 +720,7 @@ "unique_id": "ab:cd:ef:12:c3:82:cb:22-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -809,22 +729,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:c3:82:cb:22:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:c3:82:cb:22", "endpoint_id": 1, "available": true, @@ -833,7 +737,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 30.0 }, @@ -857,22 +761,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:c3:82:cb:22:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:c3:82:cb:22", "endpoint_id": 1, "available": true, @@ -905,22 +793,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:c3:82:cb:22:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:c3:82:cb:22", "endpoint_id": 1, "available": true, @@ -955,22 +827,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c3:82:cb:22:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:82:cb:22", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-lepzuhto-ts011f.json b/tests/data/devices/tz3000-lepzuhto-ts011f.json index dcfae2b34..4a5e3554f 100644 --- a/tests/data/devices/tz3000-lepzuhto-ts011f.json +++ b/tests/data/devices/tz3000-lepzuhto-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1f:e8:29:50", "nwk": "0x76C5", "manufacturer": "_TZ3000_lepzuhto", @@ -434,22 +434,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:1f:e8:29:50:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1f:e8:29:50", "endpoint_id": 1, "available": true, @@ -482,22 +466,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1f:e8:29:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1f:e8:29:50", "endpoint_id": 1, "available": true, @@ -526,22 +494,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1f:e8:29:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1f:e8:29:50", "endpoint_id": 1, "available": true, @@ -561,7 +513,7 @@ "unique_id": "ab:cd:ef:12:1f:e8:29:50-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -570,22 +522,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:1f:e8:29:50:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:1f:e8:29:50", "endpoint_id": 1, "available": true, @@ -594,7 +530,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 59.54, "device_type": "Electric Metering", @@ -613,7 +549,7 @@ "unique_id": "ab:cd:ef:12:1f:e8:29:50-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -622,22 +558,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:1f:e8:29:50:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:1f:e8:29:50", "endpoint_id": 1, "available": true, @@ -646,7 +566,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 198.0 }, @@ -670,22 +590,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:1f:e8:29:50:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:1f:e8:29:50", "endpoint_id": 1, "available": true, @@ -717,22 +621,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:1f:e8:29:50:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:1f:e8:29:50", "endpoint_id": 1, "available": true, @@ -765,22 +653,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:1f:e8:29:50:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:1f:e8:29:50", "endpoint_id": 1, "available": true, @@ -815,22 +687,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:1f:e8:29:50:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1f:e8:29:50", "endpoint_id": 1, "available": true, @@ -859,22 +715,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1f:e8:29:50:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1f:e8:29:50", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-lf56vpxj-ts0202.json b/tests/data/devices/tz3000-lf56vpxj-ts0202.json index a421e3e0e..738d9d1bb 100644 --- a/tests/data/devices/tz3000-lf56vpxj-ts0202.json +++ b/tests/data/devices/tz3000-lf56vpxj-ts0202.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:95:6b:8f:d1", "nwk": "0xEB95", "manufacturer": "_TZ3000_lf56vpxj", @@ -175,22 +175,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:95:6b:8f:d1:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:95:6b:8f:d1", "endpoint_id": 1, "available": true, @@ -218,22 +202,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:95:6b:8f:d1:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:95:6b:8f:d1", "endpoint_id": 1, "available": true, @@ -263,22 +231,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:95:6b:8f:d1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:95:6b:8f:d1", "endpoint_id": 1, "available": true, @@ -311,22 +263,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:95:6b:8f:d1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:95:6b:8f:d1", "endpoint_id": 1, "available": true, @@ -355,22 +291,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:95:6b:8f:d1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:95:6b:8f:d1", "endpoint_id": 1, "available": true, @@ -399,22 +319,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:95:6b:8f:d1:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:95:6b:8f:d1", "endpoint_id": 1, "available": true, @@ -450,22 +354,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:95:6b:8f:d1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:95:6b:8f:d1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-llfaquvp-ts0012.json b/tests/data/devices/tz3000-llfaquvp-ts0012.json index 9d9646238..8c7360154 100644 --- a/tests/data/devices/tz3000-llfaquvp-ts0012.json +++ b/tests/data/devices/tz3000-llfaquvp-ts0012.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:fa:98:ca:b8", "nwk": "0xDFF7", "manufacturer": "_TZ3000_llfaquvp", @@ -300,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:fa:98:ca:b8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:98:ca:b8", "endpoint_id": 1, "available": true, @@ -348,22 +332,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fa:98:ca:b8:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fa:98:ca:b8", "endpoint_id": 1, "available": true, @@ -414,22 +382,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:fa:98:ca:b8:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fa:98:ca:b8", "endpoint_id": 2, "available": true, @@ -482,22 +434,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fa:98:ca:b8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:98:ca:b8", "endpoint_id": 1, "available": true, @@ -526,22 +462,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fa:98:ca:b8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:98:ca:b8", "endpoint_id": 1, "available": true, @@ -572,22 +492,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:fa:98:ca:b8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:98:ca:b8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-lotmgthb-ts011f.json b/tests/data/devices/tz3000-lotmgthb-ts011f.json index 915500b3f..6d1f0f510 100644 --- a/tests/data/devices/tz3000-lotmgthb-ts011f.json +++ b/tests/data/devices/tz3000-lotmgthb-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e0:b1:51:a5", "nwk": "0xE571", "manufacturer": "_TZ3000_lotmgthb", @@ -432,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e0:b1:51:a5:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:b1:51:a5", "endpoint_id": 1, "available": true, @@ -480,22 +464,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e0:b1:51:a5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:b1:51:a5", "endpoint_id": 1, "available": true, @@ -524,22 +492,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e0:b1:51:a5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:b1:51:a5", "endpoint_id": 1, "available": true, @@ -559,7 +511,7 @@ "unique_id": "ab:cd:ef:12:e0:b1:51:a5-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -568,22 +520,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:e0:b1:51:a5:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:e0:b1:51:a5", "endpoint_id": 1, "available": true, @@ -592,7 +528,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 0.71, "device_type": "Electric Metering", @@ -611,7 +547,7 @@ "unique_id": "ab:cd:ef:12:e0:b1:51:a5-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -620,22 +556,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:e0:b1:51:a5:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e0:b1:51:a5", "endpoint_id": 1, "available": true, @@ -644,7 +564,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -668,22 +588,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:e0:b1:51:a5:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e0:b1:51:a5", "endpoint_id": 1, "available": true, @@ -715,22 +619,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:e0:b1:51:a5:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e0:b1:51:a5", "endpoint_id": 1, "available": true, @@ -763,22 +651,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:e0:b1:51:a5:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e0:b1:51:a5", "endpoint_id": 1, "available": true, @@ -813,22 +685,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:e0:b1:51:a5:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e0:b1:51:a5", "endpoint_id": 1, "available": true, @@ -857,22 +713,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e0:b1:51:a5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:b1:51:a5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-lrgccsxm-ts0013.json b/tests/data/devices/tz3000-lrgccsxm-ts0013.json index e19a477e9..659ce8676 100644 --- a/tests/data/devices/tz3000-lrgccsxm-ts0013.json +++ b/tests/data/devices/tz3000-lrgccsxm-ts0013.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:67:c9:96:f3", "nwk": "0xEF03", "manufacturer": "_TZ3000_lrgccsxm", @@ -268,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:67:c9:96:f3:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:67:c9:96:f3", "endpoint_id": 1, "available": true, @@ -316,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:67:c9:96:f3:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:67:c9:96:f3", "endpoint_id": 1, "available": true, @@ -382,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:67:c9:96:f3:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:67:c9:96:f3", "endpoint_id": 2, "available": true, @@ -448,22 +400,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:67:c9:96:f3:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:67:c9:96:f3", "endpoint_id": 3, "available": true, @@ -516,22 +452,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:67:c9:96:f3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:67:c9:96:f3", "endpoint_id": 1, "available": true, @@ -560,22 +480,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:67:c9:96:f3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:67:c9:96:f3", "endpoint_id": 1, "available": true, @@ -606,22 +510,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:67:c9:96:f3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:67:c9:96:f3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-ltiqubue-ts130f.json b/tests/data/devices/tz3000-ltiqubue-ts130f.json index 6c9d030dc..e0c55ed30 100644 --- a/tests/data/devices/tz3000-ltiqubue-ts130f.json +++ b/tests/data/devices/tz3000-ltiqubue-ts130f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:43:3b:68:f1", "nwk": "0x96A6", "manufacturer": "_TZ3000_ltiqubue", @@ -167,22 +167,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:43:3b:68:f1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:3b:68:f1", "endpoint_id": 1, "available": true, @@ -215,22 +199,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:43:3b:68:f1:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:43:3b:68:f1", "endpoint_id": 1, "available": true, @@ -265,22 +233,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:43:3b:68:f1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:3b:68:f1", "endpoint_id": 1, "available": true, @@ -309,22 +261,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:43:3b:68:f1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:43:3b:68:f1", "endpoint_id": 1, "available": true, @@ -353,22 +289,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:43:3b:68:f1:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:43:3b:68:f1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-mg4dy6z6-ts0202.json b/tests/data/devices/tz3000-mg4dy6z6-ts0202.json index 8a253b688..60b57dda2 100644 --- a/tests/data/devices/tz3000-mg4dy6z6-ts0202.json +++ b/tests/data/devices/tz3000-mg4dy6z6-ts0202.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cd:66:75:56", "nwk": "0x3312", "manufacturer": "_TZ3000_mg4dy6z6", @@ -225,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:cd:66:75:56:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:66:75:56", "endpoint_id": 1, "available": true, @@ -268,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:cd:66:75:56:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:66:75:56", "endpoint_id": 1, "available": true, @@ -313,22 +281,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:cd:66:75:56:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:66:75:56", "endpoint_id": 1, "available": true, @@ -361,22 +313,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cd:66:75:56:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:66:75:56", "endpoint_id": 1, "available": true, @@ -405,22 +341,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cd:66:75:56:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:66:75:56", "endpoint_id": 1, "available": true, @@ -449,22 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:cd:66:75:56:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:cd:66:75:56", "endpoint_id": 1, "available": true, @@ -501,22 +405,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cd:66:75:56:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:66:75:56", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-mgusv51k-ts0052.json b/tests/data/devices/tz3000-mgusv51k-ts0052.json index 682098100..47acd4ba6 100644 --- a/tests/data/devices/tz3000-mgusv51k-ts0052.json +++ b/tests/data/devices/tz3000-mgusv51k-ts0052.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:77:a4:24:d4", "nwk": "0x3A98", "manufacturer": "_TZ3000_mgusv51k", @@ -275,22 +275,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:77:a4:24:d4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:77:a4:24:d4", "endpoint_id": 1, "available": true, @@ -323,36 +307,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:77:a4:24:d4:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:77:a4:24:d4:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:77:a4:24:d4", "endpoint_id": 1, "available": true, @@ -406,22 +360,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:77:a4:24:d4:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:77:a4:24:d4", "endpoint_id": 1, "available": true, @@ -455,22 +393,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:77:a4:24:d4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:77:a4:24:d4", "endpoint_id": 1, "available": true, @@ -499,22 +421,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:77:a4:24:d4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:77:a4:24:d4", "endpoint_id": 1, "available": true, @@ -545,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:77:a4:24:d4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:77:a4:24:d4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-mkhkxx1p-ts0001.json b/tests/data/devices/tz3000-mkhkxx1p-ts0001.json index fc43631ef..f6134d4a5 100644 --- a/tests/data/devices/tz3000-mkhkxx1p-ts0001.json +++ b/tests/data/devices/tz3000-mkhkxx1p-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:36:44:eb:16", "nwk": "0x45CD", "manufacturer": "_TZ3000_mkhkxx1p", @@ -476,22 +476,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:36:44:eb:16:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:44:eb:16", "endpoint_id": 1, "available": true, @@ -524,22 +508,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:36:44:eb:16:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:36:44:eb:16", "endpoint_id": 1, "available": true, @@ -592,22 +560,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:36:44:eb:16:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:44:eb:16", "endpoint_id": 1, "available": true, @@ -636,22 +588,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:36:44:eb:16:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:44:eb:16", "endpoint_id": 1, "available": true, @@ -680,22 +616,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "CustomMetering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:36:44:eb:16:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:36:44:eb:16", "endpoint_id": 1, "available": true, @@ -723,7 +643,7 @@ "unique_id": "ab:cd:ef:12:36:44:eb:16-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -732,22 +652,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:36:44:eb:16:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:36:44:eb:16", "endpoint_id": 1, "available": true, @@ -756,7 +660,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -780,22 +684,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:36:44:eb:16:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:36:44:eb:16", "endpoint_id": 1, "available": true, @@ -828,22 +716,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:36:44:eb:16:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:36:44:eb:16", "endpoint_id": 1, "available": true, @@ -878,22 +750,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:36:44:eb:16:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:44:eb:16", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-mugyhz0q-ts0207.json b/tests/data/devices/tz3000-mugyhz0q-ts0207.json index e5e98f55c..c591b9e32 100644 --- a/tests/data/devices/tz3000-mugyhz0q-ts0207.json +++ b/tests/data/devices/tz3000-mugyhz0q-ts0207.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:22:d4:c0:9f", "nwk": "0x8930", "manufacturer": "_TZ3000_mugyhz0q", @@ -207,22 +207,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:22:d4:c0:9f:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:d4:c0:9f", "endpoint_id": 1, "available": true, @@ -252,22 +236,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:22:d4:c0:9f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:d4:c0:9f", "endpoint_id": 1, "available": true, @@ -300,22 +268,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:d4:c0:9f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:d4:c0:9f", "endpoint_id": 1, "available": true, @@ -344,22 +296,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:d4:c0:9f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:d4:c0:9f", "endpoint_id": 1, "available": true, @@ -388,22 +324,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:22:d4:c0:9f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:22:d4:c0:9f", "endpoint_id": 1, "available": true, @@ -440,22 +360,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:22:d4:c0:9f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:d4:c0:9f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-mw1pqqqt-ts0003.json b/tests/data/devices/tz3000-mw1pqqqt-ts0003.json index 9d2891bcb..2e2e003f2 100644 --- a/tests/data/devices/tz3000-mw1pqqqt-ts0003.json +++ b/tests/data/devices/tz3000-mw1pqqqt-ts0003.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2c:e2:6d:88", "nwk": "0x56B5", "manufacturer": "_TZ3000_mw1pqqqt", @@ -698,22 +698,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 1, "available": true, @@ -746,22 +730,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 1, "available": true, @@ -812,22 +780,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 2, "available": true, @@ -878,22 +830,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 3, "available": true, @@ -946,22 +882,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 1, "available": true, @@ -994,22 +914,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 1, "available": true, @@ -1044,22 +948,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 1, "available": true, @@ -1088,22 +976,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 1, "available": true, @@ -1132,22 +1004,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 1, "available": true, @@ -1175,7 +1031,7 @@ "unique_id": "ab:cd:ef:12:2c:e2:6d:88-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1184,22 +1040,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 1, "available": true, @@ -1208,7 +1048,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -1232,22 +1072,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 1, "available": true, @@ -1280,22 +1104,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 1, "available": true, @@ -1330,22 +1138,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:2c:e2:6d:88:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2c:e2:6d:88", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-npzfdcof-ts0001.json b/tests/data/devices/tz3000-npzfdcof-ts0001.json index 6b6d36c3f..93fd3cfb2 100644 --- a/tests/data/devices/tz3000-npzfdcof-ts0001.json +++ b/tests/data/devices/tz3000-npzfdcof-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:37:97:29:ff", "nwk": "0xBDD4", "manufacturer": "_TZ3000_npzfdcof", @@ -469,22 +469,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:37:97:29:ff:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:37:97:29:ff", "endpoint_id": 1, "available": true, @@ -517,22 +501,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:37:97:29:ff:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:37:97:29:ff", "endpoint_id": 1, "available": true, @@ -585,22 +553,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:37:97:29:ff:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:37:97:29:ff", "endpoint_id": 1, "available": true, @@ -629,22 +581,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:37:97:29:ff:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:37:97:29:ff", "endpoint_id": 1, "available": true, @@ -673,22 +609,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:37:97:29:ff:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:37:97:29:ff", "endpoint_id": 1, "available": true, @@ -716,7 +636,7 @@ "unique_id": "ab:cd:ef:12:37:97:29:ff-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -725,22 +645,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:37:97:29:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:37:97:29:ff", "endpoint_id": 1, "available": true, @@ -749,7 +653,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -773,22 +677,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:37:97:29:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:37:97:29:ff", "endpoint_id": 1, "available": true, @@ -821,22 +709,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:37:97:29:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:37:97:29:ff", "endpoint_id": 1, "available": true, @@ -871,22 +743,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:37:97:29:ff:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:37:97:29:ff", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-o1jzcxou-ts011f.json b/tests/data/devices/tz3000-o1jzcxou-ts011f.json index 0fca0884a..ced73be76 100644 --- a/tests/data/devices/tz3000-o1jzcxou-ts011f.json +++ b/tests/data/devices/tz3000-o1jzcxou-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8f:94:54:69", "nwk": "0x6D2B", "manufacturer": "_TZ3000_o1jzcxou", @@ -225,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:8f:94:54:69:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8f:94:54:69", "endpoint_id": 1, "available": true, @@ -273,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8f:94:54:69:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8f:94:54:69", "endpoint_id": 1, "available": true, @@ -317,22 +285,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8f:94:54:69:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8f:94:54:69", "endpoint_id": 1, "available": true, @@ -363,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:8f:94:54:69:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:8f:94:54:69", "endpoint_id": 1, "available": true, @@ -407,22 +343,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8f:94:54:69:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8f:94:54:69", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-o4mkahkc-ts0202.json b/tests/data/devices/tz3000-o4mkahkc-ts0202.json index eb98ce2be..8fc6d63ec 100644 --- a/tests/data/devices/tz3000-o4mkahkc-ts0202.json +++ b/tests/data/devices/tz3000-o4mkahkc-ts0202.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:33:39:10:3f", "nwk": "0xE80A", "manufacturer": "_TZ3000_o4mkahkc", @@ -225,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:33:39:10:3f:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:39:10:3f", "endpoint_id": 1, "available": true, @@ -268,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:33:39:10:3f:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:39:10:3f", "endpoint_id": 1, "available": true, @@ -313,22 +281,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:33:39:10:3f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:39:10:3f", "endpoint_id": 1, "available": true, @@ -361,22 +313,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:33:39:10:3f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:39:10:3f", "endpoint_id": 1, "available": true, @@ -405,22 +341,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:33:39:10:3f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:39:10:3f", "endpoint_id": 1, "available": true, @@ -449,22 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:33:39:10:3f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:33:39:10:3f", "endpoint_id": 1, "available": true, @@ -501,22 +405,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:33:39:10:3f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:39:10:3f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-okaz9tjs-ts011f.json b/tests/data/devices/tz3000-okaz9tjs-ts011f.json index 20ab27e33..5de4ec755 100644 --- a/tests/data/devices/tz3000-okaz9tjs-ts011f.json +++ b/tests/data/devices/tz3000-okaz9tjs-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:44:63:a9:95", "nwk": "0x12C0", "manufacturer": "_TZ3000_okaz9tjs", @@ -414,22 +414,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:44:63:a9:95:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:63:a9:95", "endpoint_id": 1, "available": true, @@ -462,22 +446,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:44:63:a9:95:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:44:63:a9:95", "endpoint_id": 1, "available": true, @@ -513,22 +481,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:44:63:a9:95:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:63:a9:95", "endpoint_id": 1, "available": true, @@ -557,22 +509,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:44:63:a9:95:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:63:a9:95", "endpoint_id": 1, "available": true, @@ -592,7 +528,7 @@ "unique_id": "ab:cd:ef:12:44:63:a9:95-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -601,22 +537,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringClusterWithUnit", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:44:63:a9:95:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:44:63:a9:95", "endpoint_id": 1, "available": true, @@ -625,7 +545,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 0.0, "device_type": "Electric Metering", @@ -644,7 +564,7 @@ "unique_id": "ab:cd:ef:12:44:63:a9:95-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -653,22 +573,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:44:63:a9:95:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:44:63:a9:95", "endpoint_id": 1, "available": true, @@ -677,7 +581,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -701,22 +605,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:44:63:a9:95:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:44:63:a9:95", "endpoint_id": 1, "available": true, @@ -749,22 +637,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:44:63:a9:95:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:44:63:a9:95", "endpoint_id": 1, "available": true, @@ -799,22 +671,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:44:63:a9:95:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:44:63:a9:95", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-p26flek3-ts0001.json b/tests/data/devices/tz3000-p26flek3-ts0001.json index f6ff447a7..6a0bec9c7 100644 --- a/tests/data/devices/tz3000-p26flek3-ts0001.json +++ b/tests/data/devices/tz3000-p26flek3-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:37:1f:21:53", "nwk": "0x73BD", "manufacturer": "_TZ3000_p26flek3", @@ -250,22 +250,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:37:1f:21:53:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:37:1f:21:53", "endpoint_id": 1, "available": true, @@ -298,22 +282,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:37:1f:21:53:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:37:1f:21:53", "endpoint_id": 1, "available": true, @@ -366,22 +334,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:37:1f:21:53:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:37:1f:21:53", "endpoint_id": 1, "available": true, @@ -414,22 +366,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:37:1f:21:53:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:37:1f:21:53", "endpoint_id": 1, "available": true, @@ -464,22 +400,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:37:1f:21:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:37:1f:21:53", "endpoint_id": 1, "available": true, @@ -508,22 +428,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:37:1f:21:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:37:1f:21:53", "endpoint_id": 1, "available": true, @@ -554,22 +458,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:37:1f:21:53:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:37:1f:21:53", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-pl5v1yyy-ts011f.json b/tests/data/devices/tz3000-pl5v1yyy-ts011f.json index 0a01344c5..29ca37d22 100644 --- a/tests/data/devices/tz3000-pl5v1yyy-ts011f.json +++ b/tests/data/devices/tz3000-pl5v1yyy-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:89:87:b0:a2", "nwk": "0xB06A", "manufacturer": "_TZ3000_pl5v1yyy", @@ -798,22 +798,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 1, "available": true, @@ -846,22 +830,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 1, "available": true, @@ -890,22 +858,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 1, "available": true, @@ -925,7 +877,7 @@ "unique_id": "ab:cd:ef:12:89:87:b0:a2-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -934,22 +886,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 1, "available": true, @@ -958,7 +894,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 0.0, "device_type": "Electric Metering", @@ -977,7 +913,7 @@ "unique_id": "ab:cd:ef:12:89:87:b0:a2-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -986,22 +922,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 1, "available": true, @@ -1010,7 +930,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -1034,22 +954,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 1, "available": true, @@ -1082,22 +986,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 1, "available": true, @@ -1132,22 +1020,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 1, "available": true, @@ -1174,22 +1046,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 2, "available": true, @@ -1216,22 +1072,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 3, "available": true, @@ -1258,22 +1098,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 4, "available": true, @@ -1300,22 +1124,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 5, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "5:0x0006", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:5:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 5, "available": true, @@ -1344,22 +1152,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:89:87:b0:a2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:89:87:b0:a2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-qa8s8vca-ts130f.json b/tests/data/devices/tz3000-qa8s8vca-ts130f.json index a7c048db0..eb316e19a 100644 --- a/tests/data/devices/tz3000-qa8s8vca-ts130f.json +++ b/tests/data/devices/tz3000-qa8s8vca-ts130f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:fb:49:87:24", "nwk": "0x1021", "manufacturer": "_TZ3000_qa8s8vca", @@ -208,22 +208,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:fb:49:87:24:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:fb:49:87:24", "endpoint_id": 1, "available": true, @@ -258,22 +242,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fb:49:87:24:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fb:49:87:24", "endpoint_id": 1, "available": true, @@ -302,22 +270,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fb:49:87:24:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fb:49:87:24", "endpoint_id": 1, "available": true, @@ -346,22 +298,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:fb:49:87:24:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:fb:49:87:24", "endpoint_id": 1, "available": true, @@ -392,22 +328,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:fb:49:87:24:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fb:49:87:24", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-qdnrzbd3-ts0202.json b/tests/data/devices/tz3000-qdnrzbd3-ts0202.json index 42c82fa15..ede7a2056 100644 --- a/tests/data/devices/tz3000-qdnrzbd3-ts0202.json +++ b/tests/data/devices/tz3000-qdnrzbd3-ts0202.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e7:3d:9e:ec", "nwk": "0x9767", "manufacturer": "_TZ3000_qdnrzbd3", @@ -225,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:e7:3d:9e:ec:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:3d:9e:ec", "endpoint_id": 1, "available": true, @@ -268,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:e7:3d:9e:ec:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:3d:9e:ec", "endpoint_id": 1, "available": true, @@ -313,22 +281,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e7:3d:9e:ec:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:3d:9e:ec", "endpoint_id": 1, "available": true, @@ -361,22 +313,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:3d:9e:ec:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:3d:9e:ec", "endpoint_id": 1, "available": true, @@ -405,22 +341,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:3d:9e:ec:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:3d:9e:ec", "endpoint_id": 1, "available": true, @@ -449,22 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:e7:3d:9e:ec:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:e7:3d:9e:ec", "endpoint_id": 1, "available": true, @@ -501,22 +405,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e7:3d:9e:ec:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:3d:9e:ec", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-qqdbccb3-ts130f.json b/tests/data/devices/tz3000-qqdbccb3-ts130f.json index 5de40b6cd..32b3289aa 100644 --- a/tests/data/devices/tz3000-qqdbccb3-ts130f.json +++ b/tests/data/devices/tz3000-qqdbccb3-ts130f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5a:e5:28:64", "nwk": "0x87C1", "manufacturer": "_TZ3000_qqdbccb3", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:5a:e5:28:64:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:e5:28:64", "endpoint_id": 1, "available": true, @@ -202,22 +186,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:5a:e5:28:64:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:5a:e5:28:64", "endpoint_id": 1, "available": true, @@ -252,22 +220,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5a:e5:28:64:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:e5:28:64", "endpoint_id": 1, "available": true, @@ -296,22 +248,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5a:e5:28:64:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:e5:28:64", "endpoint_id": 1, "available": true, @@ -340,22 +276,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:5a:e5:28:64:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:5a:e5:28:64", "endpoint_id": 1, "available": true, @@ -386,22 +306,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5a:e5:28:64:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:e5:28:64", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-r6buo8ba-ts011f.json b/tests/data/devices/tz3000-r6buo8ba-ts011f.json index c92f57507..5931cf1f1 100644 --- a/tests/data/devices/tz3000-r6buo8ba-ts011f.json +++ b/tests/data/devices/tz3000-r6buo8ba-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d7:9b:67:b6", "nwk": "0xB8AC", "manufacturer": "_TZ3000_r6buo8ba", @@ -411,22 +411,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d7:9b:67:b6:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d7:9b:67:b6", "endpoint_id": 1, "available": true, @@ -459,22 +443,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d7:9b:67:b6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d7:9b:67:b6", "endpoint_id": 1, "available": true, @@ -503,22 +471,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d7:9b:67:b6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d7:9b:67:b6", "endpoint_id": 1, "available": true, @@ -538,7 +490,7 @@ "unique_id": "ab:cd:ef:12:d7:9b:67:b6-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -547,22 +499,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringClusterWithUnit", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:d7:9b:67:b6:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:d7:9b:67:b6", "endpoint_id": 1, "available": true, @@ -571,7 +507,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 95.36, "zcl_unit_of_measurement": 0 @@ -588,7 +524,7 @@ "unique_id": "ab:cd:ef:12:d7:9b:67:b6-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -597,22 +533,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:d7:9b:67:b6:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:d7:9b:67:b6", "endpoint_id": 1, "available": true, @@ -621,7 +541,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 1.0 }, @@ -645,22 +565,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:d7:9b:67:b6:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:d7:9b:67:b6", "endpoint_id": 1, "available": true, @@ -693,22 +597,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:d7:9b:67:b6:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:d7:9b:67:b6", "endpoint_id": 1, "available": true, @@ -743,22 +631,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d7:9b:67:b6:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:d7:9b:67:b6", "endpoint_id": 1, "available": true, @@ -787,22 +659,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d7:9b:67:b6:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d7:9b:67:b6", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-rbl8c85w-ts0012.json b/tests/data/devices/tz3000-rbl8c85w-ts0012.json index d7dc14f72..e97c5e69f 100644 --- a/tests/data/devices/tz3000-rbl8c85w-ts0012.json +++ b/tests/data/devices/tz3000-rbl8c85w-ts0012.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ea:31:66:45", "nwk": "0xC257", "manufacturer": "_TZ3000_rbl8c85w", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ea:31:66:45:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:31:66:45", "endpoint_id": 1, "available": true, @@ -269,22 +253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ea:31:66:45:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ea:31:66:45", "endpoint_id": 1, "available": true, @@ -335,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:ea:31:66:45:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ea:31:66:45", "endpoint_id": 2, "available": true, @@ -403,22 +355,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ea:31:66:45:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:31:66:45", "endpoint_id": 1, "available": true, @@ -447,22 +383,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ea:31:66:45:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:31:66:45", "endpoint_id": 1, "available": true, @@ -493,22 +413,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ea:31:66:45:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:31:66:45", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-sgb0xhwn-ts011f.json b/tests/data/devices/tz3000-sgb0xhwn-ts011f.json index 518f0c663..312c65454 100644 --- a/tests/data/devices/tz3000-sgb0xhwn-ts011f.json +++ b/tests/data/devices/tz3000-sgb0xhwn-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d4:a5:92:4b", "nwk": "0x21D6", "manufacturer": "_TZ3000_sgb0xhwn", @@ -644,22 +644,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, @@ -692,22 +676,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, @@ -740,22 +708,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, @@ -790,22 +742,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, @@ -834,22 +770,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, @@ -869,7 +789,7 @@ "unique_id": "ab:cd:ef:12:d4:a5:92:4b-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -878,22 +798,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, @@ -902,7 +806,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 0.0, "device_type": "Electric Metering", @@ -921,7 +825,7 @@ "unique_id": "ab:cd:ef:12:d4:a5:92:4b-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -930,22 +834,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, @@ -954,7 +842,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -978,22 +866,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, @@ -1026,22 +898,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, @@ -1076,22 +932,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, @@ -1118,22 +958,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, @@ -1166,22 +990,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 2, "available": true, @@ -1210,22 +1018,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d4:a5:92:4b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:a5:92:4b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-snq47izk-ts0013.json b/tests/data/devices/tz3000-snq47izk-ts0013.json index 2f2816c51..27a0a77a8 100644 --- a/tests/data/devices/tz3000-snq47izk-ts0013.json +++ b/tests/data/devices/tz3000-snq47izk-ts0013.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ce:9d:2a:9c", "nwk": "0x3FD3", "manufacturer": "_TZ3000_snq47izk", @@ -268,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ce:9d:2a:9c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:9d:2a:9c", "endpoint_id": 1, "available": true, @@ -316,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ce:9d:2a:9c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ce:9d:2a:9c", "endpoint_id": 1, "available": true, @@ -382,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:ce:9d:2a:9c:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ce:9d:2a:9c", "endpoint_id": 2, "available": true, @@ -448,22 +400,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:ce:9d:2a:9c:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ce:9d:2a:9c", "endpoint_id": 3, "available": true, @@ -516,22 +452,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ce:9d:2a:9c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:9d:2a:9c", "endpoint_id": 1, "available": true, @@ -560,22 +480,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ce:9d:2a:9c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:9d:2a:9c", "endpoint_id": 1, "available": true, @@ -606,22 +510,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ce:9d:2a:9c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ce:9d:2a:9c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-tgddllx4-ts0001.json b/tests/data/devices/tz3000-tgddllx4-ts0001.json index 032dd84a1..1614ec54c 100644 --- a/tests/data/devices/tz3000-tgddllx4-ts0001.json +++ b/tests/data/devices/tz3000-tgddllx4-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:02:1f:a7:43", "nwk": "0x9F4A", "manufacturer": "_TZ3000_tgddllx4", @@ -388,22 +388,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:02:1f:a7:43:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:1f:a7:43", "endpoint_id": 1, "available": true, @@ -436,22 +420,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:02:1f:a7:43:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:02:1f:a7:43", "endpoint_id": 1, "available": true, @@ -504,22 +472,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:02:1f:a7:43:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:1f:a7:43", "endpoint_id": 1, "available": true, @@ -548,22 +500,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:02:1f:a7:43:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:1f:a7:43", "endpoint_id": 1, "available": true, @@ -592,22 +528,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "CustomMetering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:02:1f:a7:43:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:02:1f:a7:43", "endpoint_id": 1, "available": true, @@ -634,7 +554,7 @@ "unique_id": "ab:cd:ef:12:02:1f:a7:43-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -643,22 +563,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:02:1f:a7:43:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:02:1f:a7:43", "endpoint_id": 1, "available": true, @@ -667,7 +571,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -691,22 +595,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:02:1f:a7:43:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:02:1f:a7:43", "endpoint_id": 1, "available": true, @@ -739,22 +627,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:02:1f:a7:43:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:02:1f:a7:43", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-tqlv4ug4-ts0001.json b/tests/data/devices/tz3000-tqlv4ug4-ts0001.json index 2a116d7b5..c9a2071bc 100644 --- a/tests/data/devices/tz3000-tqlv4ug4-ts0001.json +++ b/tests/data/devices/tz3000-tqlv4ug4-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ab:aa:f0:9a", "nwk": "0xE4EB", "manufacturer": "_TZ3000_tqlv4ug4", @@ -576,22 +576,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ab:aa:f0:9a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:aa:f0:9a", "endpoint_id": 1, "available": true, @@ -624,22 +608,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ab:aa:f0:9a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ab:aa:f0:9a", "endpoint_id": 1, "available": true, @@ -692,22 +660,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ab:aa:f0:9a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ab:aa:f0:9a", "endpoint_id": 1, "available": true, @@ -740,22 +692,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ab:aa:f0:9a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ab:aa:f0:9a", "endpoint_id": 1, "available": true, @@ -790,22 +726,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ab:aa:f0:9a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:aa:f0:9a", "endpoint_id": 1, "available": true, @@ -834,22 +754,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ab:aa:f0:9a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:aa:f0:9a", "endpoint_id": 1, "available": true, @@ -878,22 +782,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:ab:aa:f0:9a:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:ab:aa:f0:9a", "endpoint_id": 1, "available": true, @@ -921,7 +809,7 @@ "unique_id": "ab:cd:ef:12:ab:aa:f0:9a-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -930,22 +818,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ab:aa:f0:9a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ab:aa:f0:9a", "endpoint_id": 1, "available": true, @@ -954,7 +826,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -978,22 +850,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ab:aa:f0:9a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ab:aa:f0:9a", "endpoint_id": 1, "available": true, @@ -1026,22 +882,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ab:aa:f0:9a:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ab:aa:f0:9a", "endpoint_id": 1, "available": true, @@ -1076,22 +916,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ab:aa:f0:9a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:aa:f0:9a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-typdpbpg-ts011f.json b/tests/data/devices/tz3000-typdpbpg-ts011f.json index b954eaaf3..14cf637be 100644 --- a/tests/data/devices/tz3000-typdpbpg-ts011f.json +++ b/tests/data/devices/tz3000-typdpbpg-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:fe:eb:bf:54", "nwk": "0xF95D", "manufacturer": "_TZ3000_typdpbpg", @@ -590,22 +590,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -638,22 +622,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -687,22 +655,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -735,22 +687,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -785,22 +721,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -829,22 +749,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -864,7 +768,7 @@ "unique_id": "ab:cd:ef:12:fe:eb:bf:54-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -873,22 +777,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringClusterWithUnit", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -897,7 +785,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 3.87, "device_type": "Electric Metering", @@ -916,7 +804,7 @@ "unique_id": "ab:cd:ef:12:fe:eb:bf:54-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -925,22 +813,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -949,7 +821,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 1.0 }, @@ -973,22 +845,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -1021,22 +877,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -1071,22 +911,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -1113,22 +937,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, @@ -1163,22 +971,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:fe:eb:bf:54:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fe:eb:bf:54", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-u3oupgdy-ts0004.json b/tests/data/devices/tz3000-u3oupgdy-ts0004.json index fda0d3387..ba7666363 100644 --- a/tests/data/devices/tz3000-u3oupgdy-ts0004.json +++ b/tests/data/devices/tz3000-u3oupgdy-ts0004.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:64:23:80:ed", "nwk": "0xD5E1", "manufacturer": "_TZ3000_u3oupgdy", @@ -517,22 +517,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:64:23:80:ed:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:64:23:80:ed", "endpoint_id": 1, "available": true, @@ -565,22 +549,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:64:23:80:ed:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:64:23:80:ed", "endpoint_id": 1, "available": true, @@ -631,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:64:23:80:ed:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:64:23:80:ed", "endpoint_id": 2, "available": true, @@ -697,22 +649,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:64:23:80:ed:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:64:23:80:ed", "endpoint_id": 3, "available": true, @@ -763,22 +699,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:64:23:80:ed:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:64:23:80:ed", "endpoint_id": 4, "available": true, @@ -831,22 +751,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:64:23:80:ed:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:64:23:80:ed", "endpoint_id": 1, "available": true, @@ -879,22 +783,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:64:23:80:ed:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:64:23:80:ed", "endpoint_id": 1, "available": true, @@ -929,22 +817,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:64:23:80:ed:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:64:23:80:ed", "endpoint_id": 1, "available": true, @@ -973,22 +845,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:64:23:80:ed:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:64:23:80:ed", "endpoint_id": 1, "available": true, @@ -1019,22 +875,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:64:23:80:ed:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:64:23:80:ed", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-u4kojtqz-ts0002.json b/tests/data/devices/tz3000-u4kojtqz-ts0002.json index 934d564e3..280df5f70 100644 --- a/tests/data/devices/tz3000-u4kojtqz-ts0002.json +++ b/tests/data/devices/tz3000-u4kojtqz-ts0002.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:26:0c:99:7b", "nwk": "0x89CD", "manufacturer": "_TZ3000_u4kojtqz", @@ -302,22 +302,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:26:0c:99:7b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:26:0c:99:7b", "endpoint_id": 1, "available": true, @@ -350,22 +334,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:26:0c:99:7b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:26:0c:99:7b", "endpoint_id": 1, "available": true, @@ -416,22 +384,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:26:0c:99:7b:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:26:0c:99:7b", "endpoint_id": 2, "available": true, @@ -484,22 +436,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:26:0c:99:7b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:26:0c:99:7b", "endpoint_id": 1, "available": true, @@ -533,22 +469,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:26:0c:99:7b:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:26:0c:99:7b", "endpoint_id": 2, "available": true, @@ -584,22 +504,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:26:0c:99:7b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:26:0c:99:7b", "endpoint_id": 1, "available": true, @@ -628,22 +532,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:26:0c:99:7b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:26:0c:99:7b", "endpoint_id": 1, "available": true, @@ -674,22 +562,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:26:0c:99:7b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:26:0c:99:7b", "endpoint_id": 1, "available": true, @@ -723,22 +595,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 2, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "2:0x0019_client", - "unique_id": "ab:cd:ef:12:26:0c:99:7b:2:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:26:0c:99:7b", "endpoint_id": 2, "available": true, diff --git a/tests/data/devices/tz3000-uwkja6z1-ts011f.json b/tests/data/devices/tz3000-uwkja6z1-ts011f.json index 2ca2350bc..129234ffe 100644 --- a/tests/data/devices/tz3000-uwkja6z1-ts011f.json +++ b/tests/data/devices/tz3000-uwkja6z1-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:29:ef:78:8d", "nwk": "0x595D", "manufacturer": "_TZ3000_uwkja6z1", @@ -740,22 +740,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 1, "available": true, @@ -788,22 +772,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 1, "available": true, @@ -832,22 +800,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 1, "available": true, @@ -867,7 +819,7 @@ "unique_id": "ab:cd:ef:12:29:ef:78:8d-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -876,22 +828,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 1, "available": true, @@ -900,7 +836,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 318.0, "device_type": "Electric Metering", @@ -919,7 +855,7 @@ "unique_id": "ab:cd:ef:12:29:ef:78:8d-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -928,22 +864,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 1, "available": true, @@ -952,7 +872,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -976,22 +896,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 1, "available": true, @@ -1024,22 +928,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 1, "available": true, @@ -1063,7 +951,7 @@ "unique_id": "ab:cd:ef:12:29:ef:78:8d-2-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -1072,22 +960,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 2, "available": true, @@ -1096,7 +968,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 318.0, "device_type": "Electric Metering", @@ -1115,7 +987,7 @@ "unique_id": "ab:cd:ef:12:29:ef:78:8d-2-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1124,22 +996,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 2, "available": true, @@ -1148,7 +1004,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -1172,22 +1028,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 2, "available": true, @@ -1220,22 +1060,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 2, "available": true, @@ -1270,22 +1094,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 1, "available": true, @@ -1312,22 +1120,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 2, "available": true, @@ -1356,22 +1148,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:29:ef:78:8d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:29:ef:78:8d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-vw8pawxa-ts130f.json b/tests/data/devices/tz3000-vw8pawxa-ts130f.json index c1256c8d5..bafdbc4c2 100644 --- a/tests/data/devices/tz3000-vw8pawxa-ts130f.json +++ b/tests/data/devices/tz3000-vw8pawxa-ts130f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:47:c9:40:68", "nwk": "0xBE40", "manufacturer": "_TZ3000_vw8pawxa", @@ -294,22 +294,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:47:c9:40:68:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:47:c9:40:68", "endpoint_id": 1, "available": true, @@ -344,22 +328,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:47:c9:40:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:c9:40:68", "endpoint_id": 1, "available": true, @@ -388,22 +356,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:47:c9:40:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:c9:40:68", "endpoint_id": 1, "available": true, @@ -434,22 +386,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:47:c9:40:68:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:c9:40:68", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-w0qqde0g-ts011f.json b/tests/data/devices/tz3000-w0qqde0g-ts011f.json index 51e0b3b76..b6de9c638 100644 --- a/tests/data/devices/tz3000-w0qqde0g-ts011f.json +++ b/tests/data/devices/tz3000-w0qqde0g-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b6:0e:f6:2e", "nwk": "0x79E7", "manufacturer": "_TZ3000_w0qqde0g", @@ -432,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:b6:0e:f6:2e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b6:0e:f6:2e", "endpoint_id": 1, "available": true, @@ -480,22 +464,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:b6:0e:f6:2e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b6:0e:f6:2e", "endpoint_id": 1, "available": true, @@ -528,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:b6:0e:f6:2e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b6:0e:f6:2e", "endpoint_id": 1, "available": true, @@ -578,22 +530,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b6:0e:f6:2e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b6:0e:f6:2e", "endpoint_id": 1, "available": true, @@ -622,22 +558,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b6:0e:f6:2e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b6:0e:f6:2e", "endpoint_id": 1, "available": true, @@ -657,7 +577,7 @@ "unique_id": "ab:cd:ef:12:b6:0e:f6:2e-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -666,22 +586,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringClusterWithUnit", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:b6:0e:f6:2e:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:b6:0e:f6:2e", "endpoint_id": 1, "available": true, @@ -690,7 +594,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 0.0, "zcl_unit_of_measurement": 0 @@ -707,7 +611,7 @@ "unique_id": "ab:cd:ef:12:b6:0e:f6:2e-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -716,22 +620,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b6:0e:f6:2e:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b6:0e:f6:2e", "endpoint_id": 1, "available": true, @@ -740,7 +628,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -764,22 +652,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b6:0e:f6:2e:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b6:0e:f6:2e", "endpoint_id": 1, "available": true, @@ -812,22 +684,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:b6:0e:f6:2e:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:b6:0e:f6:2e", "endpoint_id": 1, "available": true, @@ -862,22 +718,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:b6:0e:f6:2e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b6:0e:f6:2e", "endpoint_id": 1, "available": true, @@ -904,22 +744,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:b6:0e:f6:2e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b6:0e:f6:2e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-wcgyhnp3-ts0222.json b/tests/data/devices/tz3000-wcgyhnp3-ts0222.json index 1bc066e18..5fb95229c 100644 --- a/tests/data/devices/tz3000-wcgyhnp3-ts0222.json +++ b/tests/data/devices/tz3000-wcgyhnp3-ts0222.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f9:d0:9a:b8", "nwk": "0x47F7", "manufacturer": "_TZ3000_wcgyhnp3", @@ -252,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:f9:d0:9a:b8:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:d0:9a:b8", "endpoint_id": 1, "available": true, @@ -297,22 +281,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f9:d0:9a:b8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:d0:9a:b8", "endpoint_id": 1, "available": true, @@ -345,22 +313,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f9:d0:9a:b8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:d0:9a:b8", "endpoint_id": 1, "available": true, @@ -389,22 +341,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f9:d0:9a:b8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:d0:9a:b8", "endpoint_id": 1, "available": true, @@ -433,22 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:f9:d0:9a:b8:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:f9:d0:9a:b8", "endpoint_id": 1, "available": true, @@ -483,22 +403,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:f9:d0:9a:b8:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:f9:d0:9a:b8", "endpoint_id": 1, "available": true, @@ -527,22 +431,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:f9:d0:9a:b8:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:f9:d0:9a:b8", "endpoint_id": 1, "available": true, @@ -571,22 +459,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:f9:d0:9a:b8:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:f9:d0:9a:b8", "endpoint_id": 1, "available": true, @@ -617,22 +489,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f9:d0:9a:b8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:d0:9a:b8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-wkai4ga5-ts0044.json b/tests/data/devices/tz3000-wkai4ga5-ts0044.json index 7bf4aea16..1fae422ad 100644 --- a/tests/data/devices/tz3000-wkai4ga5-ts0044.json +++ b/tests/data/devices/tz3000-wkai4ga5-ts0044.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:03:34:3e:f1", "nwk": "0x884C", "manufacturer": "_TZ3000_wkai4ga5", @@ -247,22 +247,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:03:34:3e:f1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:34:3e:f1", "endpoint_id": 1, "available": true, @@ -291,22 +275,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:03:34:3e:f1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:34:3e:f1", "endpoint_id": 1, "available": true, @@ -335,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:03:34:3e:f1:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:03:34:3e:f1", "endpoint_id": 1, "available": true, @@ -385,22 +337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "ab:cd:ef:12:03:34:3e:f1:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:03:34:3e:f1", "endpoint_id": 2, "available": true, @@ -434,22 +370,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 3, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "3:0x0001", - "unique_id": "ab:cd:ef:12:03:34:3e:f1:3:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:03:34:3e:f1", "endpoint_id": 3, "available": true, @@ -483,22 +403,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 4, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "4:0x0001", - "unique_id": "ab:cd:ef:12:03:34:3e:f1:4:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:03:34:3e:f1", "endpoint_id": 4, "available": true, @@ -534,22 +438,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:03:34:3e:f1:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:03:34:3e:f1", "endpoint_id": 1, "available": true, @@ -576,22 +464,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:03:34:3e:f1:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:03:34:3e:f1", "endpoint_id": 2, "available": true, @@ -618,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:03:34:3e:f1:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:03:34:3e:f1", "endpoint_id": 3, "available": true, @@ -660,22 +516,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:03:34:3e:f1:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:03:34:3e:f1", "endpoint_id": 4, "available": true, @@ -704,22 +544,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:03:34:3e:f1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:34:3e:f1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-wkr3jqmr-ts0004.json b/tests/data/devices/tz3000-wkr3jqmr-ts0004.json index 198531709..304be2008 100644 --- a/tests/data/devices/tz3000-wkr3jqmr-ts0004.json +++ b/tests/data/devices/tz3000-wkr3jqmr-ts0004.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cf:6d:17:08", "nwk": "0x6CF1", "manufacturer": "_TZ3000_wkr3jqmr", @@ -540,22 +540,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:cf:6d:17:08:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:6d:17:08", "endpoint_id": 1, "available": true, @@ -588,22 +572,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:cf:6d:17:08:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:cf:6d:17:08", "endpoint_id": 1, "available": true, @@ -654,22 +622,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:cf:6d:17:08:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:cf:6d:17:08", "endpoint_id": 2, "available": true, @@ -720,22 +672,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:cf:6d:17:08:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:cf:6d:17:08", "endpoint_id": 3, "available": true, @@ -786,22 +722,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:cf:6d:17:08:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:cf:6d:17:08", "endpoint_id": 4, "available": true, @@ -854,22 +774,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:cf:6d:17:08:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:cf:6d:17:08", "endpoint_id": 1, "available": true, @@ -902,22 +806,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:cf:6d:17:08:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:cf:6d:17:08", "endpoint_id": 1, "available": true, @@ -952,22 +840,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cf:6d:17:08:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:6d:17:08", "endpoint_id": 1, "available": true, @@ -996,22 +868,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cf:6d:17:08:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:6d:17:08", "endpoint_id": 1, "available": true, @@ -1042,22 +898,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:cf:6d:17:08:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:cf:6d:17:08", "endpoint_id": 1, "available": true, @@ -1092,22 +932,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cf:6d:17:08:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:6d:17:08", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-wn65ixz9-ts0001.json b/tests/data/devices/tz3000-wn65ixz9-ts0001.json index dc4eceabd..c3721a5fe 100644 --- a/tests/data/devices/tz3000-wn65ixz9-ts0001.json +++ b/tests/data/devices/tz3000-wn65ixz9-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ab:82:5f:a1", "nwk": "0x145F", "manufacturer": "_TZ3000_wn65ixz9", @@ -243,22 +243,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ab:82:5f:a1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:82:5f:a1", "endpoint_id": 1, "available": true, @@ -291,22 +275,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ab:82:5f:a1:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ab:82:5f:a1", "endpoint_id": 1, "available": true, @@ -359,22 +327,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ab:82:5f:a1:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ab:82:5f:a1", "endpoint_id": 1, "available": true, @@ -407,22 +359,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ab:82:5f:a1:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ab:82:5f:a1", "endpoint_id": 1, "available": true, @@ -457,22 +393,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ab:82:5f:a1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:82:5f:a1", "endpoint_id": 1, "available": true, @@ -501,22 +421,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ab:82:5f:a1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:82:5f:a1", "endpoint_id": 1, "available": true, @@ -547,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ab:82:5f:a1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:82:5f:a1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-xa9g7rxs-ts1002.json b/tests/data/devices/tz3000-xa9g7rxs-ts1002.json index 0cd0e838f..cd851e866 100644 --- a/tests/data/devices/tz3000-xa9g7rxs-ts1002.json +++ b/tests/data/devices/tz3000-xa9g7rxs-ts1002.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:66:b9:e7:ff", "nwk": "0xB0E5", "manufacturer": "_TZ3000_xa9g7rxs", @@ -227,22 +227,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:66:b9:e7:ff:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:b9:e7:ff", "endpoint_id": 1, "available": true, @@ -275,22 +259,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:66:b9:e7:ff:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:b9:e7:ff", "endpoint_id": 1, "available": true, @@ -319,22 +287,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:66:b9:e7:ff:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:b9:e7:ff", "endpoint_id": 1, "available": true, @@ -363,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:66:b9:e7:ff:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:66:b9:e7:ff", "endpoint_id": 1, "available": true, @@ -415,22 +351,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:66:b9:e7:ff:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:b9:e7:ff", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-xabckq1v-ts004f.json b/tests/data/devices/tz3000-xabckq1v-ts004f.json index b73413678..692cb203c 100644 --- a/tests/data/devices/tz3000-xabckq1v-ts004f.json +++ b/tests/data/devices/tz3000-xabckq1v-ts004f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:df:1d:21:23", "nwk": "0xF631", "manufacturer": "_TZ3000_xabckq1v", @@ -314,22 +314,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:df:1d:21:23:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:df:1d:21:23", "endpoint_id": 1, "available": true, @@ -362,22 +346,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:df:1d:21:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:df:1d:21:23", "endpoint_id": 1, "available": true, @@ -406,22 +374,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:df:1d:21:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:df:1d:21:23", "endpoint_id": 1, "available": true, @@ -450,22 +402,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:df:1d:21:23:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:df:1d:21:23", "endpoint_id": 1, "available": true, @@ -502,22 +438,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:df:1d:21:23:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:df:1d:21:23", "endpoint_id": 2, "available": true, @@ -544,22 +464,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:df:1d:21:23:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:df:1d:21:23", "endpoint_id": 3, "available": true, @@ -586,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:df:1d:21:23:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:df:1d:21:23", "endpoint_id": 4, "available": true, @@ -630,22 +518,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:df:1d:21:23:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:df:1d:21:23", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-xkap8wtb-ts000f.json b/tests/data/devices/tz3000-xkap8wtb-ts000f.json index 5669dbc97..212b3edf5 100644 --- a/tests/data/devices/tz3000-xkap8wtb-ts000f.json +++ b/tests/data/devices/tz3000-xkap8wtb-ts000f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:07:f0:0f:c0", "nwk": "0x9B37", "manufacturer": "_TZ3000_xkap8wtb", @@ -437,22 +437,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:07:f0:0f:c0:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:f0:0f:c0", "endpoint_id": 1, "available": true, @@ -485,22 +469,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:07:f0:0f:c0:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:07:f0:0f:c0", "endpoint_id": 1, "available": true, @@ -553,22 +521,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:07:f0:0f:c0:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:07:f0:0f:c0", "endpoint_id": 1, "available": true, @@ -604,22 +556,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:07:f0:0f:c0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:f0:0f:c0", "endpoint_id": 1, "available": true, @@ -648,22 +584,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:07:f0:0f:c0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:f0:0f:c0", "endpoint_id": 1, "available": true, @@ -692,22 +612,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:07:f0:0f:c0:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:07:f0:0f:c0", "endpoint_id": 1, "available": true, @@ -735,7 +639,7 @@ "unique_id": "ab:cd:ef:12:07:f0:0f:c0-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -744,22 +648,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:07:f0:0f:c0:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:07:f0:0f:c0", "endpoint_id": 1, "available": true, @@ -768,7 +656,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -792,22 +680,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:07:f0:0f:c0:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:07:f0:0f:c0", "endpoint_id": 1, "available": true, @@ -839,22 +711,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:07:f0:0f:c0:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:07:f0:0f:c0", "endpoint_id": 1, "available": true, @@ -887,22 +743,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:07:f0:0f:c0:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:07:f0:0f:c0", "endpoint_id": 1, "available": true, @@ -937,22 +777,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:07:f0:0f:c0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:07:f0:0f:c0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-xr3htd96-ts0201.json b/tests/data/devices/tz3000-xr3htd96-ts0201.json index e9e1cf39f..b277b5d86 100644 --- a/tests/data/devices/tz3000-xr3htd96-ts0201.json +++ b/tests/data/devices/tz3000-xr3htd96-ts0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:65:20:2c:b5", "nwk": "0xB370", "manufacturer": "_TZ3000_xr3htd96", @@ -192,22 +192,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:65:20:2c:b5:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:20:2c:b5", "endpoint_id": 1, "available": true, @@ -240,22 +224,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:65:20:2c:b5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:20:2c:b5", "endpoint_id": 1, "available": true, @@ -284,22 +252,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:65:20:2c:b5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:20:2c:b5", "endpoint_id": 1, "available": true, @@ -328,22 +280,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:65:20:2c:b5:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:65:20:2c:b5", "endpoint_id": 1, "available": true, @@ -378,22 +314,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:65:20:2c:b5:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:65:20:2c:b5", "endpoint_id": 1, "available": true, @@ -422,22 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:65:20:2c:b5:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:65:20:2c:b5", "endpoint_id": 1, "available": true, @@ -468,22 +372,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:65:20:2c:b5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:20:2c:b5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-xxacnuab-ts0004.json b/tests/data/devices/tz3000-xxacnuab-ts0004.json index 1400d2ee0..2f1d02f57 100644 --- a/tests/data/devices/tz3000-xxacnuab-ts0004.json +++ b/tests/data/devices/tz3000-xxacnuab-ts0004.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:0b:b6:c8:60", "nwk": "0x5605", "manufacturer": "_TZ3000_xxacnuab", @@ -504,22 +504,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:0b:b6:c8:60:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0b:b6:c8:60", "endpoint_id": 1, "available": true, @@ -552,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:0b:b6:c8:60:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0b:b6:c8:60", "endpoint_id": 1, "available": true, @@ -618,22 +586,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:0b:b6:c8:60:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0b:b6:c8:60", "endpoint_id": 2, "available": true, @@ -684,22 +636,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:0b:b6:c8:60:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0b:b6:c8:60", "endpoint_id": 3, "available": true, @@ -750,22 +686,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:0b:b6:c8:60:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0b:b6:c8:60", "endpoint_id": 4, "available": true, @@ -818,22 +738,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:0b:b6:c8:60:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:0b:b6:c8:60", "endpoint_id": 1, "available": true, @@ -868,22 +772,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0b:b6:c8:60:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0b:b6:c8:60", "endpoint_id": 1, "available": true, @@ -912,22 +800,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0b:b6:c8:60:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0b:b6:c8:60", "endpoint_id": 1, "available": true, @@ -958,22 +830,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:0b:b6:c8:60:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0b:b6:c8:60", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-yj6k7vfo-ts0041.json b/tests/data/devices/tz3000-yj6k7vfo-ts0041.json index f97174285..57502d1fd 100644 --- a/tests/data/devices/tz3000-yj6k7vfo-ts0041.json +++ b/tests/data/devices/tz3000-yj6k7vfo-ts0041.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f9:5d:da:9e", "nwk": "0x6CDA", "manufacturer": "_TZ3000_yj6k7vfo", @@ -200,22 +200,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f9:5d:da:9e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:5d:da:9e", "endpoint_id": 1, "available": true, @@ -244,22 +228,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f9:5d:da:9e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:5d:da:9e", "endpoint_id": 1, "available": true, @@ -288,22 +256,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:f9:5d:da:9e:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:f9:5d:da:9e", "endpoint_id": 1, "available": true, @@ -340,22 +292,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f9:5d:da:9e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:5d:da:9e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-ynmowqk2-ts011f.json b/tests/data/devices/tz3000-ynmowqk2-ts011f.json index 63236c0d9..2f0ac05c6 100644 --- a/tests/data/devices/tz3000-ynmowqk2-ts011f.json +++ b/tests/data/devices/tz3000-ynmowqk2-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:91:a9:a4:a5", "nwk": "0x5040", "manufacturer": "_TZ3000_ynmowqk2", @@ -438,22 +438,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:91:a9:a4:a5:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:91:a9:a4:a5", "endpoint_id": 1, "available": true, @@ -486,22 +470,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:91:a9:a4:a5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:91:a9:a4:a5", "endpoint_id": 1, "available": true, @@ -530,22 +498,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:91:a9:a4:a5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:91:a9:a4:a5", "endpoint_id": 1, "available": true, @@ -565,7 +517,7 @@ "unique_id": "ab:cd:ef:12:91:a9:a4:a5-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -574,22 +526,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:91:a9:a4:a5:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:91:a9:a4:a5", "endpoint_id": 1, "available": true, @@ -598,7 +534,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 0.0, "device_type": "Electric Metering", @@ -617,7 +553,7 @@ "unique_id": "ab:cd:ef:12:91:a9:a4:a5-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -626,22 +562,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:91:a9:a4:a5:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:91:a9:a4:a5", "endpoint_id": 1, "available": true, @@ -650,7 +570,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -674,22 +594,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:91:a9:a4:a5:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:91:a9:a4:a5", "endpoint_id": 1, "available": true, @@ -722,22 +626,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:91:a9:a4:a5:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:91:a9:a4:a5", "endpoint_id": 1, "available": true, @@ -772,22 +660,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:91:a9:a4:a5:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:91:a9:a4:a5", "endpoint_id": 1, "available": true, @@ -816,22 +688,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:91:a9:a4:a5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:91:a9:a4:a5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-zl1kmjqx-ty0201.json b/tests/data/devices/tz3000-zl1kmjqx-ty0201.json index 79b059376..a709e4050 100644 --- a/tests/data/devices/tz3000-zl1kmjqx-ty0201.json +++ b/tests/data/devices/tz3000-zl1kmjqx-ty0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d2:4c:8b:b1", "nwk": "0x71DE", "manufacturer": "_TZ3000_zl1kmjqx", @@ -186,22 +186,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d2:4c:8b:b1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:4c:8b:b1", "endpoint_id": 1, "available": true, @@ -234,22 +218,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:4c:8b:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:4c:8b:b1", "endpoint_id": 1, "available": true, @@ -278,22 +246,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:4c:8b:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:4c:8b:b1", "endpoint_id": 1, "available": true, @@ -322,22 +274,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:d2:4c:8b:b1:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:d2:4c:8b:b1", "endpoint_id": 1, "available": true, @@ -374,22 +310,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:d2:4c:8b:b1:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d2:4c:8b:b1", "endpoint_id": 1, "available": true, @@ -420,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d2:4c:8b:b1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:4c:8b:b1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-zl1kmjqx.json b/tests/data/devices/tz3000-zl1kmjqx.json index f8371bc76..80fffa119 100644 --- a/tests/data/devices/tz3000-zl1kmjqx.json +++ b/tests/data/devices/tz3000-zl1kmjqx.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:bd:22:a3:f8", "nwk": "0xB22D", "manufacturer": "_TZ3000_zl1kmjqx", @@ -193,22 +193,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:bd:22:a3:f8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bd:22:a3:f8", "endpoint_id": 1, "available": true, @@ -241,22 +225,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bd:22:a3:f8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bd:22:a3:f8", "endpoint_id": 1, "available": true, @@ -285,22 +253,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bd:22:a3:f8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bd:22:a3:f8", "endpoint_id": 1, "available": true, @@ -329,22 +281,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:bd:22:a3:f8:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:bd:22:a3:f8", "endpoint_id": 1, "available": true, @@ -381,22 +317,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:bd:22:a3:f8:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:bd:22:a3:f8", "endpoint_id": 1, "available": true, @@ -425,22 +345,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:bd:22:a3:f8:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:bd:22:a3:f8", "endpoint_id": 1, "available": true, @@ -471,22 +375,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:bd:22:a3:f8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bd:22:a3:f8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-zv6x8bt2-ts011f.json b/tests/data/devices/tz3000-zv6x8bt2-ts011f.json index f64c38728..b34931cb0 100644 --- a/tests/data/devices/tz3000-zv6x8bt2-ts011f.json +++ b/tests/data/devices/tz3000-zv6x8bt2-ts011f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:85:03:69:d5", "nwk": "0xB25B", "manufacturer": "_TZ3000_zv6x8bt2", @@ -592,22 +592,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, @@ -640,22 +624,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, @@ -688,22 +656,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, @@ -738,22 +690,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, @@ -782,22 +718,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, @@ -817,7 +737,7 @@ "unique_id": "ab:cd:ef:12:85:03:69:d5-1-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -826,22 +746,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaZBMeteringCluster", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, @@ -850,7 +754,7 @@ "unit": "kWh" }, "state": { - "class_name": "PolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 1.67, "device_type": "Electric Metering", @@ -869,7 +773,7 @@ "unique_id": "ab:cd:ef:12:85:03:69:d5-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -878,22 +782,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, @@ -902,7 +790,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 1415.0 }, @@ -926,22 +814,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, @@ -974,22 +846,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, @@ -1024,22 +880,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, @@ -1066,22 +906,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, @@ -1116,22 +940,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:85:03:69:d5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:03:69:d5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3000-zw7yf6yk-ts0001.json b/tests/data/devices/tz3000-zw7yf6yk-ts0001.json index 655cfb4a0..d835fcbcd 100644 --- a/tests/data/devices/tz3000-zw7yf6yk-ts0001.json +++ b/tests/data/devices/tz3000-zw7yf6yk-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:3f:75:01:c9", "nwk": "0x0DA7", "manufacturer": "_TZ3000_zw7yf6yk", @@ -439,22 +439,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:3f:75:01:c9:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3f:75:01:c9", "endpoint_id": 1, "available": true, @@ -487,22 +471,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:3f:75:01:c9:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:3f:75:01:c9", "endpoint_id": 1, "available": true, @@ -555,22 +523,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3f:75:01:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3f:75:01:c9", "endpoint_id": 1, "available": true, @@ -599,22 +551,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3f:75:01:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3f:75:01:c9", "endpoint_id": 1, "available": true, @@ -643,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:3f:75:01:c9:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:3f:75:01:c9", "endpoint_id": 1, "available": true, @@ -686,7 +606,7 @@ "unique_id": "ab:cd:ef:12:3f:75:01:c9-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -695,22 +615,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:3f:75:01:c9:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:3f:75:01:c9", "endpoint_id": 1, "available": true, @@ -719,7 +623,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0 }, @@ -743,22 +647,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:3f:75:01:c9:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:3f:75:01:c9", "endpoint_id": 1, "available": true, @@ -791,22 +679,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:3f:75:01:c9:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:3f:75:01:c9", "endpoint_id": 1, "available": true, @@ -841,22 +713,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:3f:75:01:c9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3f:75:01:c9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3002-vaq2bfcu-ts0726.json b/tests/data/devices/tz3002-vaq2bfcu-ts0726.json index 392f7f7b9..fd5824660 100644 --- a/tests/data/devices/tz3002-vaq2bfcu-ts0726.json +++ b/tests/data/devices/tz3002-vaq2bfcu-ts0726.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f0:bb:38:d7", "nwk": "0xE49C", "manufacturer": "_TZ3002_vaq2bfcu", @@ -484,22 +484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f0:bb:38:d7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:bb:38:d7", "endpoint_id": 1, "available": true, @@ -532,22 +516,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f0:bb:38:d7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:bb:38:d7", "endpoint_id": 1, "available": true, @@ -576,22 +544,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f0:bb:38:d7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:bb:38:d7", "endpoint_id": 1, "available": true, @@ -622,22 +574,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:f0:bb:38:d7:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f0:bb:38:d7", "endpoint_id": 1, "available": true, @@ -664,22 +600,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:f0:bb:38:d7:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f0:bb:38:d7", "endpoint_id": 2, "available": true, @@ -706,22 +626,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:f0:bb:38:d7:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f0:bb:38:d7", "endpoint_id": 3, "available": true, @@ -748,22 +652,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:f0:bb:38:d7:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f0:bb:38:d7", "endpoint_id": 4, "available": true, @@ -790,22 +678,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 5, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "5:0x0006", - "unique_id": "ab:cd:ef:12:f0:bb:38:d7:5:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f0:bb:38:d7", "endpoint_id": 5, "available": true, @@ -832,22 +704,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 6, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "6:0x0006", - "unique_id": "ab:cd:ef:12:f0:bb:38:d7:6:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f0:bb:38:d7", "endpoint_id": 6, "available": true, @@ -876,22 +732,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f0:bb:38:d7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:bb:38:d7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3002-zjuvw9zf-ts0726.json b/tests/data/devices/tz3002-zjuvw9zf-ts0726.json index 3ea756c7c..b6ae252f1 100644 --- a/tests/data/devices/tz3002-zjuvw9zf-ts0726.json +++ b/tests/data/devices/tz3002-zjuvw9zf-ts0726.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:50:fa:6e:0f", "nwk": "0xB0B2", "manufacturer": "_TZ3002_zjuvw9zf", @@ -280,22 +280,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:50:fa:6e:0f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:50:fa:6e:0f", "endpoint_id": 1, "available": true, @@ -328,22 +312,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:50:fa:6e:0f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:50:fa:6e:0f", "endpoint_id": 1, "available": true, @@ -372,22 +340,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:50:fa:6e:0f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:50:fa:6e:0f", "endpoint_id": 1, "available": true, @@ -418,22 +370,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:50:fa:6e:0f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:50:fa:6e:0f", "endpoint_id": 1, "available": true, @@ -460,22 +396,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:50:fa:6e:0f:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:50:fa:6e:0f", "endpoint_id": 2, "available": true, @@ -504,22 +424,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:50:fa:6e:0f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:50:fa:6e:0f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3040-bb6xaihh-ts0202.json b/tests/data/devices/tz3040-bb6xaihh-ts0202.json index 88bd1f36f..7ebc4a8e0 100644 --- a/tests/data/devices/tz3040-bb6xaihh-ts0202.json +++ b/tests/data/devices/tz3040-bb6xaihh-ts0202.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d3:a3:07:1f", "nwk": "0xFC90", "manufacturer": "_TZ3040_bb6xaihh", @@ -250,22 +250,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:d3:a3:07:1f:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d3:a3:07:1f", "endpoint_id": 1, "available": true, @@ -293,22 +277,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:d3:a3:07:1f:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d3:a3:07:1f", "endpoint_id": 1, "available": true, @@ -338,22 +306,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d3:a3:07:1f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d3:a3:07:1f", "endpoint_id": 1, "available": true, @@ -386,22 +338,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d3:a3:07:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d3:a3:07:1f", "endpoint_id": 1, "available": true, @@ -430,22 +366,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d3:a3:07:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d3:a3:07:1f", "endpoint_id": 1, "available": true, @@ -474,22 +394,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:d3:a3:07:1f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:d3:a3:07:1f", "endpoint_id": 1, "available": true, @@ -528,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d3:a3:07:1f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d3:a3:07:1f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-09hzmirw-ts0502b.json b/tests/data/devices/tz3210-09hzmirw-ts0502b.json index 7a8e3546e..2f1311585 100644 --- a/tests/data/devices/tz3210-09hzmirw-ts0502b.json +++ b/tests/data/devices/tz3210-09hzmirw-ts0502b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:93:d3:8d:53", "nwk": "0x7479", "manufacturer": "_TZ3210_09hzmirw", @@ -318,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:93:d3:8d:53:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:d3:8d:53", "endpoint_id": 1, "available": true, @@ -366,50 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:93:d3:8d:53:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:93:d3:8d:53:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:93:d3:8d:53:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:93:d3:8d:53", "endpoint_id": 1, "available": true, @@ -464,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:93:d3:8d:53:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:93:d3:8d:53", "endpoint_id": 1, "available": true, @@ -513,22 +437,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:93:d3:8d:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:d3:8d:53", "endpoint_id": 1, "available": true, @@ -557,22 +465,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:93:d3:8d:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:d3:8d:53", "endpoint_id": 1, "available": true, @@ -603,22 +495,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:93:d3:8d:53:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:d3:8d:53", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-0jxeoadc-ts0049.json b/tests/data/devices/tz3210-0jxeoadc-ts0049.json index a8dd3bf9f..afa694bc5 100644 --- a/tests/data/devices/tz3210-0jxeoadc-ts0049.json +++ b/tests/data/devices/tz3210-0jxeoadc-ts0049.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f1:08:7a:54", "nwk": "0x0517", "manufacturer": "_TZ3210_0jxeoadc", @@ -204,22 +204,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f1:08:7a:54:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:08:7a:54", "endpoint_id": 1, "available": true, @@ -253,22 +237,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f1:08:7a:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:08:7a:54", "endpoint_id": 1, "available": true, @@ -297,22 +265,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f1:08:7a:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:08:7a:54", "endpoint_id": 1, "available": true, @@ -341,22 +293,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:f1:08:7a:54:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:f1:08:7a:54", "endpoint_id": 1, "available": true, @@ -392,22 +328,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f1:08:7a:54:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:08:7a:54", "endpoint_id": 1, "available": true, @@ -438,22 +358,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:f1:08:7a:54:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:f1:08:7a:54", "endpoint_id": 1, "available": true, @@ -482,22 +386,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f1:08:7a:54:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f1:08:7a:54", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-3mpwqzuu-ts110e.json b/tests/data/devices/tz3210-3mpwqzuu-ts110e.json index 7e858cf20..c460327ec 100644 --- a/tests/data/devices/tz3210-3mpwqzuu-ts110e.json +++ b/tests/data/devices/tz3210-3mpwqzuu-ts110e.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:01:e4:a9:87", "nwk": "0x68A5", "manufacturer": "_TZ3210_3mpwqzuu", @@ -396,22 +396,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:01:e4:a9:87:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:01:e4:a9:87", "endpoint_id": 1, "available": true, @@ -444,36 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:01:e4:a9:87:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:01:e4:a9:87:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:01:e4:a9:87", "endpoint_id": 1, "available": true, @@ -525,36 +479,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:01:e4:a9:87:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 2, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "2:0x0008", - "unique_id": "ab:cd:ef:12:01:e4:a9:87:2:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:01:e4:a9:87", "endpoint_id": 2, "available": true, @@ -608,22 +532,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:01:e4:a9:87:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:01:e4:a9:87", "endpoint_id": 1, "available": true, @@ -652,22 +560,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:01:e4:a9:87:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:01:e4:a9:87", "endpoint_id": 1, "available": true, @@ -698,22 +590,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:01:e4:a9:87:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:01:e4:a9:87", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-3ulg9kpo-ts0021.json b/tests/data/devices/tz3210-3ulg9kpo-ts0021.json index 80c3ba24e..0fba1f195 100644 --- a/tests/data/devices/tz3210-3ulg9kpo-ts0021.json +++ b/tests/data/devices/tz3210-3ulg9kpo-ts0021.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:97:dd:c8:ba", "nwk": "0x81A8", "manufacturer": "_TZ3210_3ulg9kpo", @@ -200,22 +200,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:97:dd:c8:ba:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:dd:c8:ba", "endpoint_id": 1, "available": true, @@ -245,22 +229,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:97:dd:c8:ba:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:dd:c8:ba", "endpoint_id": 1, "available": true, @@ -289,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:97:dd:c8:ba:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:dd:c8:ba", "endpoint_id": 1, "available": true, @@ -333,22 +285,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:97:dd:c8:ba:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:97:dd:c8:ba", "endpoint_id": 1, "available": true, @@ -385,22 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:97:dd:c8:ba:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:97:dd:c8:ba", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-5rta89nj-ts0601.json b/tests/data/devices/tz3210-5rta89nj-ts0601.json index 3267ec31a..d8f115203 100644 --- a/tests/data/devices/tz3210-5rta89nj-ts0601.json +++ b/tests/data/devices/tz3210-5rta89nj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:be:aa:be:f4", "nwk": "0xB907", "manufacturer": "_TZ3210_5rta89nj", @@ -237,22 +237,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:be:aa:be:f4:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:aa:be:f4", "endpoint_id": 1, "available": true, @@ -282,22 +266,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:be:aa:be:f4:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:aa:be:f4", "endpoint_id": 1, "available": true, @@ -330,22 +298,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:be:aa:be:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:aa:be:f4", "endpoint_id": 1, "available": true, @@ -374,22 +326,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:be:aa:be:f4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:aa:be:f4", "endpoint_id": 1, "available": true, @@ -418,22 +354,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:be:aa:be:f4:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:be:aa:be:f4", "endpoint_id": 1, "available": true, @@ -470,22 +390,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:be:aa:be:f4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:aa:be:f4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-7vgttna6-ts0001.json b/tests/data/devices/tz3210-7vgttna6-ts0001.json index 339ebbdf9..702610b1d 100644 --- a/tests/data/devices/tz3210-7vgttna6-ts0001.json +++ b/tests/data/devices/tz3210-7vgttna6-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:3f:bf:0b:23", "nwk": "0x57BB", "manufacturer": "_TZ3210_7vgttna6", @@ -155,22 +155,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3f:bf:0b:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3f:bf:0b:23", "endpoint_id": 1, "available": true, @@ -199,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3f:bf:0b:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3f:bf:0b:23", "endpoint_id": 1, "available": true, @@ -245,22 +213,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:3f:bf:0b:23:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:3f:bf:0b:23", "endpoint_id": 1, "available": true, @@ -289,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:3f:bf:0b:23:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3f:bf:0b:23", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-a04acm9s-ts0001.json b/tests/data/devices/tz3210-a04acm9s-ts0001.json index 762267840..de6727191 100644 --- a/tests/data/devices/tz3210-a04acm9s-ts0001.json +++ b/tests/data/devices/tz3210-a04acm9s-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6e:06:95:22", "nwk": "0x08F9", "manufacturer": "_TZ3210_a04acm9s", @@ -161,22 +161,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6e:06:95:22:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6e:06:95:22", "endpoint_id": 1, "available": true, @@ -205,22 +189,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6e:06:95:22:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6e:06:95:22", "endpoint_id": 1, "available": true, @@ -251,22 +219,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:6e:06:95:22:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:6e:06:95:22", "endpoint_id": 1, "available": true, @@ -295,22 +247,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6e:06:95:22:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6e:06:95:22", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-bfwvfyx1-ts0505b.json b/tests/data/devices/tz3210-bfwvfyx1-ts0505b.json index 2dbd6547f..1eb662659 100644 --- a/tests/data/devices/tz3210-bfwvfyx1-ts0505b.json +++ b/tests/data/devices/tz3210-bfwvfyx1-ts0505b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:98:c5:5e:60", "nwk": "0x0427", "manufacturer": "_TZ3210_bfwvfyx1", @@ -318,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:98:c5:5e:60:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:c5:5e:60", "endpoint_id": 1, "available": true, @@ -366,50 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:98:c5:5e:60:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:98:c5:5e:60:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:98:c5:5e:60:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:98:c5:5e:60", "endpoint_id": 1, "available": true, @@ -468,22 +408,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:98:c5:5e:60:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:98:c5:5e:60", "endpoint_id": 1, "available": true, @@ -515,22 +439,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:98:c5:5e:60:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:98:c5:5e:60", "endpoint_id": 1, "available": true, @@ -564,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:98:c5:5e:60:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:98:c5:5e:60", "endpoint_id": 1, "available": true, @@ -615,22 +507,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:98:c5:5e:60:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:c5:5e:60", "endpoint_id": 1, "available": true, @@ -659,22 +535,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:98:c5:5e:60:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:c5:5e:60", "endpoint_id": 1, "available": true, @@ -705,22 +565,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:98:c5:5e:60:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:c5:5e:60", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-comkuwws-ts0502b.json b/tests/data/devices/tz3210-comkuwws-ts0502b.json index 184dfc995..f2388b487 100644 --- a/tests/data/devices/tz3210-comkuwws-ts0502b.json +++ b/tests/data/devices/tz3210-comkuwws-ts0502b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:03:2c:f4:f0", "nwk": "0x7BD6", "manufacturer": "_TZ3210_comkuwws", @@ -318,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:03:2c:f4:f0:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:2c:f4:f0", "endpoint_id": 1, "available": true, @@ -366,50 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:03:2c:f4:f0:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:03:2c:f4:f0:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:03:2c:f4:f0:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:03:2c:f4:f0", "endpoint_id": 1, "available": true, @@ -464,22 +404,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:03:2c:f4:f0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:2c:f4:f0", "endpoint_id": 1, "available": true, @@ -508,22 +432,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:03:2c:f4:f0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:2c:f4:f0", "endpoint_id": 1, "available": true, @@ -554,22 +462,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:03:2c:f4:f0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:03:2c:f4:f0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-dwytrmda-ts130f.json b/tests/data/devices/tz3210-dwytrmda-ts130f.json index 5ca71c04f..56a18e6e8 100644 --- a/tests/data/devices/tz3210-dwytrmda-ts130f.json +++ b/tests/data/devices/tz3210-dwytrmda-ts130f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:98:ad:85:85", "nwk": "0x67E9", "manufacturer": "_TZ3210_dwytrmda", @@ -340,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:98:ad:85:85:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:98:ad:85:85", "endpoint_id": 1, "available": true, @@ -390,22 +374,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:98:ad:85:85:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:ad:85:85", "endpoint_id": 1, "available": true, @@ -434,22 +402,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:98:ad:85:85:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:ad:85:85", "endpoint_id": 1, "available": true, @@ -480,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:98:ad:85:85:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:ad:85:85", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-ehcanwyc-ts0502b.json b/tests/data/devices/tz3210-ehcanwyc-ts0502b.json index 7d1698a6d..1a342476f 100644 --- a/tests/data/devices/tz3210-ehcanwyc-ts0502b.json +++ b/tests/data/devices/tz3210-ehcanwyc-ts0502b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d1:e8:f3:62", "nwk": "0xBF7B", "manufacturer": "_TZ3210_ehcanwyc", @@ -342,22 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d1:e8:f3:62:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:e8:f3:62", "endpoint_id": 1, "available": true, @@ -390,50 +374,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d1:e8:f3:62:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:d1:e8:f3:62:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:d1:e8:f3:62:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:d1:e8:f3:62", "endpoint_id": 1, "available": true, @@ -488,22 +428,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d1:e8:f3:62:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:e8:f3:62", "endpoint_id": 1, "available": true, @@ -532,22 +456,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d1:e8:f3:62:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:e8:f3:62", "endpoint_id": 1, "available": true, @@ -578,22 +486,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d1:e8:f3:62:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:e8:f3:62", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-ekjc2rzh-ts0225.json b/tests/data/devices/tz3210-ekjc2rzh-ts0225.json index d66545e58..1a27ef388 100644 --- a/tests/data/devices/tz3210-ekjc2rzh-ts0225.json +++ b/tests/data/devices/tz3210-ekjc2rzh-ts0225.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b6:44:52:d2", "nwk": "0x7CC4", "manufacturer": "_TZ3210_ekjc2rzh", @@ -182,22 +182,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:b6:44:52:d2:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b6:44:52:d2", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b6:44:52:d2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b6:44:52:d2", "endpoint_id": 1, "available": true, @@ -271,22 +239,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b6:44:52:d2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b6:44:52:d2", "endpoint_id": 1, "available": true, @@ -317,22 +269,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b6:44:52:d2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b6:44:52:d2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-hxtfthp5-ts0505b.json b/tests/data/devices/tz3210-hxtfthp5-ts0505b.json index aa5d8c469..98b450521 100644 --- a/tests/data/devices/tz3210-hxtfthp5-ts0505b.json +++ b/tests/data/devices/tz3210-hxtfthp5-ts0505b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:99:d6:8f:73", "nwk": "0xC918", "manufacturer": "_TZ3210_hxtfthp5", @@ -329,22 +329,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:99:d6:8f:73:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:d6:8f:73", "endpoint_id": 1, "available": true, @@ -377,50 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:99:d6:8f:73:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:99:d6:8f:73:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:99:d6:8f:73:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:99:d6:8f:73", "endpoint_id": 1, "available": true, @@ -479,22 +419,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:99:d6:8f:73:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:99:d6:8f:73", "endpoint_id": 1, "available": true, @@ -528,22 +452,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:99:d6:8f:73:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:d6:8f:73", "endpoint_id": 1, "available": true, @@ -572,22 +480,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:99:d6:8f:73:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:d6:8f:73", "endpoint_id": 1, "available": true, @@ -618,22 +510,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:99:d6:8f:73:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:99:d6:8f:73", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-j4pdtz9v-ts0001.json b/tests/data/devices/tz3210-j4pdtz9v-ts0001.json index 7f656cd2b..ac4799487 100644 --- a/tests/data/devices/tz3210-j4pdtz9v-ts0001.json +++ b/tests/data/devices/tz3210-j4pdtz9v-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c8:12:1d:0b", "nwk": "0xB576", "manufacturer": "_TZ3210_j4pdtz9v", @@ -217,22 +217,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c8:12:1d:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:12:1d:0b", "endpoint_id": 1, "available": true, @@ -264,22 +248,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c8:12:1d:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:12:1d:0b", "endpoint_id": 1, "available": true, @@ -311,22 +279,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c8:12:1d:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:12:1d:0b", "endpoint_id": 1, "available": true, @@ -360,22 +312,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c8:12:1d:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:12:1d:0b", "endpoint_id": 1, "available": true, @@ -408,22 +344,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c8:12:1d:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:12:1d:0b", "endpoint_id": 1, "available": true, @@ -457,22 +377,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c8:12:1d:0b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:12:1d:0b", "endpoint_id": 1, "available": true, @@ -501,22 +405,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c8:12:1d:0b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:12:1d:0b", "endpoint_id": 1, "available": true, @@ -545,22 +433,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:c8:12:1d:0b:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:c8:12:1d:0b", "endpoint_id": 1, "available": true, @@ -598,22 +470,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:c8:12:1d:0b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:c8:12:1d:0b", "endpoint_id": 1, "available": true, @@ -640,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c8:12:1d:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:12:1d:0b", "endpoint_id": 1, "available": true, @@ -690,22 +530,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c8:12:1d:0b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c8:12:1d:0b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-jaap6jeb-ts0505b.json b/tests/data/devices/tz3210-jaap6jeb-ts0505b.json index 037550220..2af972aa3 100644 --- a/tests/data/devices/tz3210-jaap6jeb-ts0505b.json +++ b/tests/data/devices/tz3210-jaap6jeb-ts0505b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:42:5d:80:e8:43", "nwk": "0xC1A4", "manufacturer": "_TZ3210_jaap6jeb", @@ -372,22 +372,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "a4:c1:38:42:5d:80:e8:43:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:42:5d:80:e8:43", "endpoint_id": 1, "available": true, @@ -420,50 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "a4:c1:38:42:5d:80:e8:43:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "a4:c1:38:42:5d:80:e8:43:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "a4:c1:38:42:5d:80:e8:43:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "a4:c1:38:42:5d:80:e8:43", "endpoint_id": 1, "available": true, @@ -522,22 +462,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:42:5d:80:e8:43:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:42:5d:80:e8:43", "endpoint_id": 1, "available": true, @@ -566,22 +490,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:42:5d:80:e8:43:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:42:5d:80:e8:43", "endpoint_id": 1, "available": true, @@ -612,22 +520,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "a4:c1:38:42:5d:80:e8:43:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:42:5d:80:e8:43", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-jtifm80b-ts0502b.json b/tests/data/devices/tz3210-jtifm80b-ts0502b.json index 4883ee028..58997bc0b 100644 --- a/tests/data/devices/tz3210-jtifm80b-ts0502b.json +++ b/tests/data/devices/tz3210-jtifm80b-ts0502b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f6:ca:ce:71", "nwk": "0xC732", "manufacturer": "_TZ3210_jtifm80b", @@ -318,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f6:ca:ce:71:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f6:ca:ce:71", "endpoint_id": 1, "available": true, @@ -366,50 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:f6:ca:ce:71:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:f6:ca:ce:71:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:f6:ca:ce:71:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:f6:ca:ce:71", "endpoint_id": 1, "available": true, @@ -464,22 +404,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f6:ca:ce:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f6:ca:ce:71", "endpoint_id": 1, "available": true, @@ -508,22 +432,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f6:ca:ce:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f6:ca:ce:71", "endpoint_id": 1, "available": true, @@ -554,22 +462,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f6:ca:ce:71:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f6:ca:ce:71", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-k1msuvg6-ts110e.json b/tests/data/devices/tz3210-k1msuvg6-ts110e.json index be85074d3..84c009369 100644 --- a/tests/data/devices/tz3210-k1msuvg6-ts110e.json +++ b/tests/data/devices/tz3210-k1msuvg6-ts110e.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:31:4b:13:3c", "nwk": "0x4475", "manufacturer": "_TZ3210_k1msuvg6", @@ -347,22 +347,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:31:4b:13:3c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:31:4b:13:3c", "endpoint_id": 1, "available": true, @@ -395,36 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:31:4b:13:3c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:31:4b:13:3c:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:31:4b:13:3c", "endpoint_id": 1, "available": true, @@ -478,22 +432,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:31:4b:13:3c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:31:4b:13:3c", "endpoint_id": 1, "available": true, @@ -522,22 +460,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:31:4b:13:3c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:31:4b:13:3c", "endpoint_id": 1, "available": true, @@ -568,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:31:4b:13:3c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:31:4b:13:3c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-kjafhwd2-ts0210.json b/tests/data/devices/tz3210-kjafhwd2-ts0210.json index a3fbdb8c9..ae73986a9 100644 --- a/tests/data/devices/tz3210-kjafhwd2-ts0210.json +++ b/tests/data/devices/tz3210-kjafhwd2-ts0210.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:3b:15:29:1f", "nwk": "0xBA4D", "manufacturer": "_TZ3210_kjafhwd2", @@ -256,22 +256,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:3b:15:29:1f:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3b:15:29:1f", "endpoint_id": 1, "available": true, @@ -299,22 +283,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:3b:15:29:1f:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3b:15:29:1f", "endpoint_id": 1, "available": true, @@ -344,22 +312,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3b:15:29:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3b:15:29:1f", "endpoint_id": 1, "available": true, @@ -388,22 +340,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3b:15:29:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3b:15:29:1f", "endpoint_id": 1, "available": true, @@ -432,22 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:3b:15:29:1f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:3b:15:29:1f", "endpoint_id": 1, "available": true, @@ -484,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:3b:15:29:1f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3b:15:29:1f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-klv2wul0-ts0505b.json b/tests/data/devices/tz3210-klv2wul0-ts0505b.json index cd20ea023..51a215ac3 100644 --- a/tests/data/devices/tz3210-klv2wul0-ts0505b.json +++ b/tests/data/devices/tz3210-klv2wul0-ts0505b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:22:27:e7:71", "nwk": "0xC809", "manufacturer": "_TZ3210_klv2wul0", @@ -318,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:22:27:e7:71:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:27:e7:71", "endpoint_id": 1, "available": true, @@ -366,50 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:22:27:e7:71:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:22:27:e7:71:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:22:27:e7:71:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:22:27:e7:71", "endpoint_id": 1, "available": true, @@ -468,22 +408,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:27:e7:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:27:e7:71", "endpoint_id": 1, "available": true, @@ -512,22 +436,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:27:e7:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:27:e7:71", "endpoint_id": 1, "available": true, @@ -558,22 +466,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:22:27:e7:71:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:27:e7:71", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-ncw88jfq-ts0201.json b/tests/data/devices/tz3210-ncw88jfq-ts0201.json index 6864a14ee..88490e798 100644 --- a/tests/data/devices/tz3210-ncw88jfq-ts0201.json +++ b/tests/data/devices/tz3210-ncw88jfq-ts0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:94:03:d8:01", "nwk": "0xCAF3", "manufacturer": "_TZ3210_ncw88jfq", @@ -193,22 +193,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:94:03:d8:01:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:03:d8:01", "endpoint_id": 1, "available": true, @@ -237,22 +221,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:94:03:d8:01:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:03:d8:01", "endpoint_id": 1, "available": true, @@ -281,22 +249,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:94:03:d8:01:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:94:03:d8:01", "endpoint_id": 1, "available": true, @@ -331,22 +283,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:94:03:d8:01:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:94:03:d8:01", "endpoint_id": 1, "available": true, @@ -375,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:94:03:d8:01:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:94:03:d8:01", "endpoint_id": 1, "available": true, @@ -421,22 +341,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:94:03:d8:01:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:03:d8:01", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-qkj7rujp-ts0201.json b/tests/data/devices/tz3210-qkj7rujp-ts0201.json index d427c8b41..af48283cf 100644 --- a/tests/data/devices/tz3210-qkj7rujp-ts0201.json +++ b/tests/data/devices/tz3210-qkj7rujp-ts0201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cc:9b:48:fa", "nwk": "0x3A33", "manufacturer": "_TZ3210_qkj7rujp", @@ -205,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cc:9b:48:fa:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cc:9b:48:fa", "endpoint_id": 1, "available": true, @@ -249,22 +233,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cc:9b:48:fa:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cc:9b:48:fa", "endpoint_id": 1, "available": true, @@ -293,22 +261,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:cc:9b:48:fa:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:cc:9b:48:fa", "endpoint_id": 1, "available": true, @@ -343,22 +295,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:cc:9b:48:fa:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:cc:9b:48:fa", "endpoint_id": 1, "available": true, @@ -387,22 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:cc:9b:48:fa:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:cc:9b:48:fa", "endpoint_id": 1, "available": true, @@ -433,22 +353,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cc:9b:48:fa:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cc:9b:48:fa", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-r5afgmkl-ts0505b.json b/tests/data/devices/tz3210-r5afgmkl-ts0505b.json index 3c1c879b5..01eaa6d5e 100644 --- a/tests/data/devices/tz3210-r5afgmkl-ts0505b.json +++ b/tests/data/devices/tz3210-r5afgmkl-ts0505b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ef:1c:e4:bc", "nwk": "0x62A8", "manufacturer": "_TZ3210_r5afgmkl", @@ -301,22 +301,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:1c:e4:bc", "endpoint_id": 1, "available": true, @@ -349,50 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:ef:1c:e4:bc", "endpoint_id": 1, "available": true, @@ -451,22 +391,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:ef:1c:e4:bc", "endpoint_id": 1, "available": true, @@ -498,22 +422,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ef:1c:e4:bc", "endpoint_id": 1, "available": true, @@ -545,22 +453,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ef:1c:e4:bc", "endpoint_id": 1, "available": true, @@ -592,22 +484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ef:1c:e4:bc", "endpoint_id": 1, "available": true, @@ -639,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ef:1c:e4:bc", "endpoint_id": 1, "available": true, @@ -688,22 +548,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ef:1c:e4:bc", "endpoint_id": 1, "available": true, @@ -739,22 +583,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:1c:e4:bc", "endpoint_id": 1, "available": true, @@ -783,22 +611,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:1c:e4:bc", "endpoint_id": 1, "available": true, @@ -829,22 +641,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ef:1c:e4:bc:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:1c:e4:bc", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-ru41azca-ts0049.json b/tests/data/devices/tz3210-ru41azca-ts0049.json index 52639b3dc..8feb33859 100644 --- a/tests/data/devices/tz3210-ru41azca-ts0049.json +++ b/tests/data/devices/tz3210-ru41azca-ts0049.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ff:97:55:6f", "nwk": "0x2377", "manufacturer": "_TZ3210_ru41azca", @@ -210,22 +210,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ff:97:55:6f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ff:97:55:6f", "endpoint_id": 1, "available": true, @@ -254,22 +238,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ff:97:55:6f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ff:97:55:6f", "endpoint_id": 1, "available": true, @@ -298,22 +266,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:ff:97:55:6f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:ff:97:55:6f", "endpoint_id": 1, "available": true, @@ -351,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ff:97:55:6f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ff:97:55:6f", "endpoint_id": 1, "available": true, @@ -395,22 +331,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ff:97:55:6f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ff:97:55:6f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-sb8x2xci-ts0001.json b/tests/data/devices/tz3210-sb8x2xci-ts0001.json index 47449e1f3..8db0ae8b3 100644 --- a/tests/data/devices/tz3210-sb8x2xci-ts0001.json +++ b/tests/data/devices/tz3210-sb8x2xci-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d2:fd:33:7c", "nwk": "0xE2E2", "manufacturer": "_TZ3210_sb8x2xci", @@ -202,22 +202,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d2:fd:33:7c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:fd:33:7c", "endpoint_id": 1, "available": true, @@ -250,22 +234,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:fd:33:7c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:fd:33:7c", "endpoint_id": 1, "available": true, @@ -294,22 +262,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:fd:33:7c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:fd:33:7c", "endpoint_id": 1, "available": true, @@ -340,22 +292,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:d2:fd:33:7c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:d2:fd:33:7c", "endpoint_id": 1, "available": true, @@ -384,22 +320,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d2:fd:33:7c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:fd:33:7c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-sixywxvy-ts0505b.json b/tests/data/devices/tz3210-sixywxvy-ts0505b.json index f1e1dc3f8..f4920a7f8 100644 --- a/tests/data/devices/tz3210-sixywxvy-ts0505b.json +++ b/tests/data/devices/tz3210-sixywxvy-ts0505b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4e:e8:08:9c", "nwk": "0x7703", "manufacturer": "_TZ3210_sixywxvy", @@ -353,22 +353,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:4e:e8:08:9c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:e8:08:9c", "endpoint_id": 1, "available": true, @@ -401,50 +385,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:4e:e8:08:9c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:4e:e8:08:9c:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:4e:e8:08:9c:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:4e:e8:08:9c", "endpoint_id": 1, "available": true, @@ -503,22 +443,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4e:e8:08:9c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:e8:08:9c", "endpoint_id": 1, "available": true, @@ -547,22 +471,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4e:e8:08:9c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:e8:08:9c", "endpoint_id": 1, "available": true, @@ -593,22 +501,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:4e:e8:08:9c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:e8:08:9c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-tgvtvdoc-ts0207.json b/tests/data/devices/tz3210-tgvtvdoc-ts0207.json index 96b18b1b7..b9f19ab86 100644 --- a/tests/data/devices/tz3210-tgvtvdoc-ts0207.json +++ b/tests/data/devices/tz3210-tgvtvdoc-ts0207.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:9b:93:04:6b", "nwk": "0x6392", "manufacturer": "_TZ3210_tgvtvdoc", @@ -225,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:9b:93:04:6b:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9b:93:04:6b", "endpoint_id": 1, "available": true, @@ -268,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9b:93:04:6b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9b:93:04:6b", "endpoint_id": 1, "available": true, @@ -313,22 +281,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9b:93:04:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9b:93:04:6b", "endpoint_id": 1, "available": true, @@ -357,22 +309,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9b:93:04:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9b:93:04:6b", "endpoint_id": 1, "available": true, @@ -401,22 +337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:9b:93:04:6b:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:9b:93:04:6b", "endpoint_id": 1, "available": true, @@ -453,22 +373,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:9b:93:04:6b:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:9b:93:04:6b", "endpoint_id": 1, "available": true, @@ -497,22 +401,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9b:93:04:6b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9b:93:04:6b", "endpoint_id": 1, "available": true, @@ -541,22 +429,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9b:93:04:6b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9b:93:04:6b", "endpoint_id": 1, "available": true, @@ -585,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9b:93:04:6b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9b:93:04:6b", "endpoint_id": 1, "available": true, @@ -631,22 +487,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:9b:93:04:6b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9b:93:04:6b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-u1dreag7-ts0502b.json b/tests/data/devices/tz3210-u1dreag7-ts0502b.json index edc107e74..70e098f55 100644 --- a/tests/data/devices/tz3210-u1dreag7-ts0502b.json +++ b/tests/data/devices/tz3210-u1dreag7-ts0502b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ec:f3:8b:8a", "nwk": "0x4159", "manufacturer": "_TZ3210_u1dreag7", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ec:f3:8b:8a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:f3:8b:8a", "endpoint_id": 1, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ec:f3:8b:8a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ec:f3:8b:8a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:ec:f3:8b:8a:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:ec:f3:8b:8a", "endpoint_id": 1, "available": true, @@ -482,22 +422,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ec:f3:8b:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:f3:8b:8a", "endpoint_id": 1, "available": true, @@ -526,22 +450,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ec:f3:8b:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:f3:8b:8a", "endpoint_id": 1, "available": true, @@ -572,22 +480,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ec:f3:8b:8a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:f3:8b:8a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-ue9kyjnj-ts0502b.json b/tests/data/devices/tz3210-ue9kyjnj-ts0502b.json index 56072a4e0..6de63ec05 100644 --- a/tests/data/devices/tz3210-ue9kyjnj-ts0502b.json +++ b/tests/data/devices/tz3210-ue9kyjnj-ts0502b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1e:71:5f:57", "nwk": "0x8A21", "manufacturer": "_TZ3210_ue9kyjnj", @@ -318,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:1e:71:5f:57:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1e:71:5f:57", "endpoint_id": 1, "available": true, @@ -366,50 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:1e:71:5f:57:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:1e:71:5f:57:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:1e:71:5f:57:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:1e:71:5f:57", "endpoint_id": 1, "available": true, @@ -464,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:1e:71:5f:57:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:1e:71:5f:57", "endpoint_id": 1, "available": true, @@ -513,22 +437,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1e:71:5f:57:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1e:71:5f:57", "endpoint_id": 1, "available": true, @@ -557,22 +465,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1e:71:5f:57:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1e:71:5f:57", "endpoint_id": 1, "available": true, @@ -603,22 +495,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1e:71:5f:57:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1e:71:5f:57", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-umi6vbsz-ts0505b.json b/tests/data/devices/tz3210-umi6vbsz-ts0505b.json index f57371ad2..8e90c5257 100644 --- a/tests/data/devices/tz3210-umi6vbsz-ts0505b.json +++ b/tests/data/devices/tz3210-umi6vbsz-ts0505b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:bf:34:ff:9a", "nwk": "0xA08A", "manufacturer": "_TZ3210_umi6vbsz", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:bf:34:ff:9a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:34:ff:9a", "endpoint_id": 1, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:bf:34:ff:9a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:bf:34:ff:9a:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:bf:34:ff:9a:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:bf:34:ff:9a", "endpoint_id": 1, "available": true, @@ -486,22 +426,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:bf:34:ff:9a:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:bf:34:ff:9a", "endpoint_id": 1, "available": true, @@ -535,22 +459,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bf:34:ff:9a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:34:ff:9a", "endpoint_id": 1, "available": true, @@ -579,22 +487,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bf:34:ff:9a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:34:ff:9a", "endpoint_id": 1, "available": true, @@ -625,22 +517,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:bf:34:ff:9a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:34:ff:9a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-up3pngle-ts0205.json b/tests/data/devices/tz3210-up3pngle-ts0205.json index 12a9d90ed..d6076caaf 100644 --- a/tests/data/devices/tz3210-up3pngle-ts0205.json +++ b/tests/data/devices/tz3210-up3pngle-ts0205.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6a:a7:51:ae", "nwk": "0x6A7E", "manufacturer": "_TZ3210_up3pngle", @@ -224,22 +224,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:6a:a7:51:ae:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:a7:51:ae", "endpoint_id": 1, "available": true, @@ -267,22 +251,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:6a:a7:51:ae:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:a7:51:ae", "endpoint_id": 1, "available": true, @@ -312,22 +280,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6a:a7:51:ae:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:a7:51:ae", "endpoint_id": 1, "available": true, @@ -356,22 +308,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6a:a7:51:ae:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:a7:51:ae", "endpoint_id": 1, "available": true, @@ -400,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:6a:a7:51:ae:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:6a:a7:51:ae", "endpoint_id": 1, "available": true, @@ -452,22 +372,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6a:a7:51:ae:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:a7:51:ae", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-wuhzzfqg-ts0202.json b/tests/data/devices/tz3210-wuhzzfqg-ts0202.json index c2c8f80a1..b78322245 100644 --- a/tests/data/devices/tz3210-wuhzzfqg-ts0202.json +++ b/tests/data/devices/tz3210-wuhzzfqg-ts0202.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6c:70:e7:59", "nwk": "0x3BE1", "manufacturer": "_TZ3210_wuhzzfqg", @@ -342,22 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:6c:70:e7:59:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6c:70:e7:59", "endpoint_id": 1, "available": true, @@ -387,22 +371,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6c:70:e7:59:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6c:70:e7:59", "endpoint_id": 1, "available": true, @@ -431,22 +399,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6c:70:e7:59:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6c:70:e7:59", "endpoint_id": 1, "available": true, @@ -475,22 +427,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:6c:70:e7:59:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:6c:70:e7:59", "endpoint_id": 1, "available": true, @@ -525,22 +461,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 2, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "2:0x0001", - "unique_id": "ab:cd:ef:12:6c:70:e7:59:2:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:6c:70:e7:59", "endpoint_id": 2, "available": true, @@ -575,22 +495,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 2, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "2:0x0402", - "unique_id": "ab:cd:ef:12:6c:70:e7:59:2:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:6c:70:e7:59", "endpoint_id": 2, "available": true, @@ -619,22 +523,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 2, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "2:0x0405", - "unique_id": "ab:cd:ef:12:6c:70:e7:59:2:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:6c:70:e7:59", "endpoint_id": 2, "available": true, @@ -663,22 +551,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 3, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "3:0x0001", - "unique_id": "ab:cd:ef:12:6c:70:e7:59:3:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:6c:70:e7:59", "endpoint_id": 3, "available": true, @@ -713,22 +585,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 3, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "3:0x0400", - "unique_id": "ab:cd:ef:12:6c:70:e7:59:3:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:6c:70:e7:59", "endpoint_id": 3, "available": true, @@ -759,22 +615,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6c:70:e7:59:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6c:70:e7:59", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3210-zdrhqmo0-ts0502b.json b/tests/data/devices/tz3210-zdrhqmo0-ts0502b.json index 29ed28b53..2b6271978 100644 --- a/tests/data/devices/tz3210-zdrhqmo0-ts0502b.json +++ b/tests/data/devices/tz3210-zdrhqmo0-ts0502b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:71:d2:67:9e", "nwk": "0xA630", "manufacturer": "_TZ3210_zdrhqmo0", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:71:d2:67:9e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:d2:67:9e", "endpoint_id": 1, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:71:d2:67:9e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:71:d2:67:9e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:71:d2:67:9e:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:71:d2:67:9e", "endpoint_id": 1, "available": true, @@ -482,22 +422,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:71:d2:67:9e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:d2:67:9e", "endpoint_id": 1, "available": true, @@ -526,22 +450,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:71:d2:67:9e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:d2:67:9e", "endpoint_id": 1, "available": true, @@ -572,22 +480,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:71:d2:67:9e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:d2:67:9e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3218-7fiyo3kv-ts000f.json b/tests/data/devices/tz3218-7fiyo3kv-ts000f.json index 7ea622558..25dd048f6 100644 --- a/tests/data/devices/tz3218-7fiyo3kv-ts000f.json +++ b/tests/data/devices/tz3218-7fiyo3kv-ts000f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6d:c3:60:d3", "nwk": "0x6671", "manufacturer": "_TZ3218_7fiyo3kv", @@ -208,22 +208,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:6d:c3:60:d3:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6d:c3:60:d3", "endpoint_id": 1, "available": true, @@ -256,22 +240,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:6d:c3:60:d3:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:6d:c3:60:d3", "endpoint_id": 1, "available": true, @@ -324,22 +292,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6d:c3:60:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6d:c3:60:d3", "endpoint_id": 1, "available": true, @@ -368,22 +320,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6d:c3:60:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6d:c3:60:d3", "endpoint_id": 1, "available": true, @@ -414,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6d:c3:60:d3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6d:c3:60:d3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3218-awarhusb-ts0225.json b/tests/data/devices/tz3218-awarhusb-ts0225.json index 86ca492ad..cd69d9639 100644 --- a/tests/data/devices/tz3218-awarhusb-ts0225.json +++ b/tests/data/devices/tz3218-awarhusb-ts0225.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b1:73:0b:43", "nwk": "0xBD5B", "manufacturer": "_TZ3218_awarhusb", @@ -199,22 +199,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:b1:73:0b:43:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:73:0b:43", "endpoint_id": 1, "available": true, @@ -244,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:b1:73:0b:43:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:73:0b:43", "endpoint_id": 1, "available": true, @@ -292,22 +260,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:73:0b:43:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:73:0b:43", "endpoint_id": 1, "available": true, @@ -336,22 +288,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:73:0b:43:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:73:0b:43", "endpoint_id": 1, "available": true, @@ -382,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b1:73:0b:43:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:73:0b:43", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3218-t9ynfz4x-ts0225.json b/tests/data/devices/tz3218-t9ynfz4x-ts0225.json index 52fb649e6..3b4bce8c0 100644 --- a/tests/data/devices/tz3218-t9ynfz4x-ts0225.json +++ b/tests/data/devices/tz3218-t9ynfz4x-ts0225.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e5:ee:a6:8a", "nwk": "0x40CF", "manufacturer": "_TZ3218_t9ynfz4x", @@ -206,22 +206,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:e5:ee:a6:8a:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:ee:a6:8a", "endpoint_id": 1, "available": true, @@ -251,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e5:ee:a6:8a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:ee:a6:8a", "endpoint_id": 1, "available": true, @@ -299,22 +267,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e5:ee:a6:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:ee:a6:8a", "endpoint_id": 1, "available": true, @@ -343,22 +295,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e5:ee:a6:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:ee:a6:8a", "endpoint_id": 1, "available": true, @@ -389,22 +325,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e5:ee:a6:8a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:ee:a6:8a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3218-ya5d6wth-ts000f.json b/tests/data/devices/tz3218-ya5d6wth-ts000f.json index 40c2aabe7..d5b50f556 100644 --- a/tests/data/devices/tz3218-ya5d6wth-ts000f.json +++ b/tests/data/devices/tz3218-ya5d6wth-ts000f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e0:ea:fe:6c", "nwk": "0x7D97", "manufacturer": "_TZ3218_ya5d6wth", @@ -388,22 +388,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e0:ea:fe:6c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:ea:fe:6c", "endpoint_id": 1, "available": true, @@ -436,22 +420,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:e0:ea:fe:6c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e0:ea:fe:6c", "endpoint_id": 1, "available": true, @@ -502,22 +470,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:e0:ea:fe:6c:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e0:ea:fe:6c", "endpoint_id": 2, "available": true, @@ -568,22 +520,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:e0:ea:fe:6c:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e0:ea:fe:6c", "endpoint_id": 3, "available": true, @@ -634,22 +570,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:e0:ea:fe:6c:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e0:ea:fe:6c", "endpoint_id": 4, "available": true, @@ -702,22 +622,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e0:ea:fe:6c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:ea:fe:6c", "endpoint_id": 1, "available": true, @@ -746,22 +650,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e0:ea:fe:6c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:ea:fe:6c", "endpoint_id": 1, "available": true, @@ -792,22 +680,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e0:ea:fe:6c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:ea:fe:6c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3290-7v1k4vufotpowp9z-ts1201.json b/tests/data/devices/tz3290-7v1k4vufotpowp9z-ts1201.json index 65f94fd2c..d85fcf01f 100644 --- a/tests/data/devices/tz3290-7v1k4vufotpowp9z-ts1201.json +++ b/tests/data/devices/tz3290-7v1k4vufotpowp9z-ts1201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:3e:18:f5:53", "nwk": "0x509B", "manufacturer": "_TZ3290_7v1k4vufotpowp9z", @@ -202,22 +202,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:3e:18:f5:53:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3e:18:f5:53", "endpoint_id": 1, "available": true, @@ -250,22 +234,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3e:18:f5:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3e:18:f5:53", "endpoint_id": 1, "available": true, @@ -294,22 +262,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3e:18:f5:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3e:18:f5:53", "endpoint_id": 1, "available": true, @@ -340,22 +292,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:3e:18:f5:53:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:3e:18:f5:53", "endpoint_id": 1, "available": true, @@ -384,22 +320,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:3e:18:f5:53:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3e:18:f5:53", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz3290-ot6ewjvmejq5ekhl-ts1201.json b/tests/data/devices/tz3290-ot6ewjvmejq5ekhl-ts1201.json index 6c2bd5cd4..dcc5d5974 100644 --- a/tests/data/devices/tz3290-ot6ewjvmejq5ekhl-ts1201.json +++ b/tests/data/devices/tz3290-ot6ewjvmejq5ekhl-ts1201.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:15:61:a8:f8", "nwk": "0x8AD7", "manufacturer": "_TZ3290_ot6ewjvmejq5ekhl", @@ -216,22 +216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:15:61:a8:f8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:61:a8:f8", "endpoint_id": 1, "available": true, @@ -264,22 +248,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:15:61:a8:f8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:61:a8:f8", "endpoint_id": 1, "available": true, @@ -308,22 +276,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:15:61:a8:f8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:61:a8:f8", "endpoint_id": 1, "available": true, @@ -352,22 +304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:15:61:a8:f8:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:15:61:a8:f8", "endpoint_id": 1, "available": true, @@ -404,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:15:61:a8:f8:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:15:61:a8:f8", "endpoint_id": 1, "available": true, @@ -448,22 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:15:61:a8:f8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:61:a8:f8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tz6210-duv6fhwt-ts0601.json b/tests/data/devices/tz6210-duv6fhwt-ts0601.json index e22c4430f..5c272df36 100644 --- a/tests/data/devices/tz6210-duv6fhwt-ts0601.json +++ b/tests/data/devices/tz6210-duv6fhwt-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:38:81:c4:0f", "nwk": "0x1E35", "manufacturer": "_TZ6210_duv6fhwt", @@ -173,22 +173,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:38:81:c4:0f:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:38:81:c4:0f", "endpoint_id": 1, "available": true, @@ -216,22 +200,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:38:81:c4:0f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:81:c4:0f", "endpoint_id": 1, "available": true, @@ -261,22 +229,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:38:81:c4:0f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:81:c4:0f", "endpoint_id": 1, "available": true, @@ -309,22 +261,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:38:81:c4:0f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:81:c4:0f", "endpoint_id": 1, "available": true, @@ -356,22 +292,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:38:81:c4:0f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:81:c4:0f", "endpoint_id": 1, "available": true, @@ -405,22 +325,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:38:81:c4:0f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:81:c4:0f", "endpoint_id": 1, "available": true, @@ -449,22 +353,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:38:81:c4:0f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:81:c4:0f", "endpoint_id": 1, "available": true, @@ -493,22 +381,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:38:81:c4:0f:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:38:81:c4:0f", "endpoint_id": 1, "available": true, @@ -539,22 +411,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:38:81:c4:0f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:81:c4:0f", "endpoint_id": 1, "available": true, @@ -589,22 +445,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:38:81:c4:0f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:81:c4:0f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tzb210-417ikxay-ts0505b.json b/tests/data/devices/tzb210-417ikxay-ts0505b.json index 08f893d13..84b8e8d2d 100644 --- a/tests/data/devices/tzb210-417ikxay-ts0505b.json +++ b/tests/data/devices/tzb210-417ikxay-ts0505b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:81:e7:c4:28", "nwk": "0x9A2E", "manufacturer": "_TZB210_417ikxay", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:81:e7:c4:28:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:e7:c4:28", "endpoint_id": 1, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:81:e7:c4:28:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:81:e7:c4:28:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:81:e7:c4:28:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:81:e7:c4:28", "endpoint_id": 1, "available": true, @@ -486,22 +426,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:81:e7:c4:28:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:81:e7:c4:28", "endpoint_id": 1, "available": true, @@ -535,22 +459,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:81:e7:c4:28:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:e7:c4:28", "endpoint_id": 1, "available": true, @@ -579,22 +487,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:81:e7:c4:28:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:e7:c4:28", "endpoint_id": 1, "available": true, @@ -625,22 +517,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:81:e7:c4:28:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:81:e7:c4:28", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tzb210-lmqquxus-ts0502b.json b/tests/data/devices/tzb210-lmqquxus-ts0502b.json index 261ab6cb7..b5b834637 100644 --- a/tests/data/devices/tzb210-lmqquxus-ts0502b.json +++ b/tests/data/devices/tzb210-lmqquxus-ts0502b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:02:78:f7:ef", "nwk": "0xBC00", "manufacturer": "_TZB210_lmqquxus", @@ -336,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:02:78:f7:ef:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:78:f7:ef", "endpoint_id": 1, "available": true, @@ -384,50 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:02:78:f7:ef:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:02:78:f7:ef:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:02:78:f7:ef:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:02:78:f7:ef", "endpoint_id": 1, "available": true, @@ -482,22 +422,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:02:78:f7:ef:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:02:78:f7:ef", "endpoint_id": 1, "available": true, @@ -531,22 +455,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:02:78:f7:ef:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:78:f7:ef", "endpoint_id": 1, "available": true, @@ -575,22 +483,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:02:78:f7:ef:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:78:f7:ef", "endpoint_id": 1, "available": true, @@ -621,22 +513,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:02:78:f7:ef:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:78:f7:ef", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tzb210-rawkvnnm-ts0502b.json b/tests/data/devices/tzb210-rawkvnnm-ts0502b.json index 322c3aaf5..c478b6247 100644 --- a/tests/data/devices/tzb210-rawkvnnm-ts0502b.json +++ b/tests/data/devices/tzb210-rawkvnnm-ts0502b.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cb:aa:9f:39", "nwk": "0x659E", "manufacturer": "_TZB210_rawkvnnm", @@ -354,22 +354,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:cb:aa:9f:39:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:aa:9f:39", "endpoint_id": 1, "available": true, @@ -402,50 +386,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:cb:aa:9f:39:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:cb:aa:9f:39:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:cb:aa:9f:39:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:cb:aa:9f:39", "endpoint_id": 1, "available": true, @@ -500,22 +440,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:cb:aa:9f:39:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:cb:aa:9f:39", "endpoint_id": 1, "available": true, @@ -549,22 +473,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cb:aa:9f:39:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:aa:9f:39", "endpoint_id": 1, "available": true, @@ -593,22 +501,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cb:aa:9f:39:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:aa:9f:39", "endpoint_id": 1, "available": true, @@ -639,22 +531,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cb:aa:9f:39:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:aa:9f:39", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-1n2zev06-ts0601.json b/tests/data/devices/tze200-1n2zev06-ts0601.json index 0c2c8e6e0..00be7eb9f 100644 --- a/tests/data/devices/tze200-1n2zev06-ts0601.json +++ b/tests/data/devices/tze200-1n2zev06-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:bf:76:9d:e2", "nwk": "0x6370", "manufacturer": "_TZE200_1n2zev06", @@ -222,22 +222,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:bf:76:9d:e2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:76:9d:e2", "endpoint_id": 1, "available": true, @@ -273,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bf:76:9d:e2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:76:9d:e2", "endpoint_id": 1, "available": true, @@ -317,22 +285,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bf:76:9d:e2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:76:9d:e2", "endpoint_id": 1, "available": true, @@ -361,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaValveWaterConsumedNoInstDemand", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:bf:76:9d:e2:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:bf:76:9d:e2", "endpoint_id": 1, "available": true, @@ -412,22 +348,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:bf:76:9d:e2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:76:9d:e2", "endpoint_id": 1, "available": true, @@ -456,22 +376,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:bf:76:9d:e2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:76:9d:e2", "endpoint_id": 1, "available": true, @@ -500,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:bf:76:9d:e2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:76:9d:e2", "endpoint_id": 1, "available": true, @@ -546,22 +434,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:bf:76:9d:e2:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:bf:76:9d:e2", "endpoint_id": 1, "available": true, @@ -590,22 +462,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:bf:76:9d:e2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:76:9d:e2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-2aaelwxk-ts0225.json b/tests/data/devices/tze200-2aaelwxk-ts0225.json index 273a15e61..ffc4da039 100644 --- a/tests/data/devices/tze200-2aaelwxk-ts0225.json +++ b/tests/data/devices/tze200-2aaelwxk-ts0225.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:94:85:f7:5f", "nwk": "0x4375", "manufacturer": "_TZE200_2aaelwxk", @@ -608,22 +608,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -653,22 +637,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -701,22 +669,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -748,22 +700,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -795,22 +731,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -842,22 +762,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -889,22 +793,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -936,22 +824,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -983,22 +855,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -1030,22 +886,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 2, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "2:0x000d", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:2:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 2, "available": true, @@ -1077,22 +917,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 3, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "3:0x000d", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:3:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 3, "available": true, @@ -1124,22 +948,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 4, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "4:0x000d", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:4:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 4, "available": true, @@ -1171,22 +979,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 5, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "5:0x000d", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:5:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 5, "available": true, @@ -1218,22 +1010,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 6, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "6:0x000d", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:6:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 6, "available": true, @@ -1265,22 +1041,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 7, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "7:0x000d", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:7:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 7, "available": true, @@ -1312,22 +1072,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 8, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "8:0x000d", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:8:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 8, "available": true, @@ -1361,22 +1105,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -1414,22 +1142,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -1458,22 +1170,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -1502,22 +1198,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, @@ -1548,22 +1228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:94:85:f7:5f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:94:85:f7:5f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-2ekuz3dz-ts0601.json b/tests/data/devices/tze200-2ekuz3dz-ts0601.json index 51d9b4ea9..342a7ebcc 100644 --- a/tests/data/devices/tze200-2ekuz3dz-ts0601.json +++ b/tests/data/devices/tze200-2ekuz3dz-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b0:68:9a:0a", "nwk": "0x954E", "manufacturer": "_TZE200_2ekuz3dz", @@ -164,22 +164,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b0:68:9a:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b0:68:9a:0a", "endpoint_id": 1, "available": true, @@ -208,22 +192,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b0:68:9a:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b0:68:9a:0a", "endpoint_id": 1, "available": true, @@ -254,22 +222,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b0:68:9a:0a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b0:68:9a:0a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-2gtsuokt-ts0601.json b/tests/data/devices/tze200-2gtsuokt-ts0601.json index 3b96f11a9..488392aa1 100644 --- a/tests/data/devices/tze200-2gtsuokt-ts0601.json +++ b/tests/data/devices/tze200-2gtsuokt-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7c:f3:f3:1d", "nwk": "0x5269", "manufacturer": "_TZE200_2gtsuokt", @@ -240,22 +240,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7c:f3:f3:1d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7c:f3:f3:1d", "endpoint_id": 1, "available": true, @@ -284,22 +268,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7c:f3:f3:1d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7c:f3:f3:1d", "endpoint_id": 1, "available": true, @@ -330,22 +298,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:7c:f3:f3:1d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7c:f3:f3:1d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-2se8efxh-ts0601.json b/tests/data/devices/tze200-2se8efxh-ts0601.json index 521e6da7d..a9b6444fb 100644 --- a/tests/data/devices/tze200-2se8efxh-ts0601.json +++ b/tests/data/devices/tze200-2se8efxh-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b1:bb:ba:02", "nwk": "0x3C40", "manufacturer": "_TZE200_2se8efxh", @@ -191,22 +191,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:bb:ba:02:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:bb:ba:02", "endpoint_id": 1, "available": true, @@ -235,22 +219,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:bb:ba:02:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:bb:ba:02", "endpoint_id": 1, "available": true, @@ -279,22 +247,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:b1:bb:ba:02:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:b1:bb:ba:02", "endpoint_id": 1, "available": true, @@ -330,22 +282,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:b1:bb:ba:02:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:b1:bb:ba:02", "endpoint_id": 1, "available": true, @@ -374,22 +310,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SoilMoistureClusterHandler", - "generic_id": "cluster_handler_0x0408", - "endpoint_id": 1, - "cluster": { - "id": 1032, - "name": "Soil Moisture Measurement", - "type": "server" - }, - "id": "1:0x0408", - "unique_id": "ab:cd:ef:12:b1:bb:ba:02:1:0x0408", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:b1:bb:ba:02", "endpoint_id": 1, "available": true, @@ -420,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b1:bb:ba:02:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:bb:ba:02", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-3t91nb6k-ts0601.json b/tests/data/devices/tze200-3t91nb6k-ts0601.json index 7ad134b11..394f88e8f 100644 --- a/tests/data/devices/tze200-3t91nb6k-ts0601.json +++ b/tests/data/devices/tze200-3t91nb6k-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ee:04:18:fc", "nwk": "0xC46E", "manufacturer": "_TZE200_3t91nb6k", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ee:04:18:fc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ee:04:18:fc", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ee:04:18:fc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ee:04:18:fc", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ee:04:18:fc:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ee:04:18:fc", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-3towulqd-ts0601.json b/tests/data/devices/tze200-3towulqd-ts0601.json index e0248831d..bd8dc15df 100644 --- a/tests/data/devices/tze200-3towulqd-ts0601.json +++ b/tests/data/devices/tze200-3towulqd-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:02:44:6a:44", "nwk": "0x4571", "manufacturer": "_TZE200_3towulqd", @@ -224,22 +224,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:02:44:6a:44:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:02:44:6a:44", "endpoint_id": 1, "available": true, @@ -267,22 +251,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:02:44:6a:44:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:44:6a:44", "endpoint_id": 1, "available": true, @@ -312,22 +280,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:02:44:6a:44:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:44:6a:44", "endpoint_id": 1, "available": true, @@ -361,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:02:44:6a:44:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:44:6a:44", "endpoint_id": 1, "available": true, @@ -410,22 +346,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:02:44:6a:44:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:44:6a:44", "endpoint_id": 1, "available": true, @@ -460,22 +380,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:02:44:6a:44:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:44:6a:44", "endpoint_id": 1, "available": true, @@ -504,22 +408,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:02:44:6a:44:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:44:6a:44", "endpoint_id": 1, "available": true, @@ -548,22 +436,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:02:44:6a:44:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:02:44:6a:44", "endpoint_id": 1, "available": true, @@ -599,22 +471,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:02:44:6a:44:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:02:44:6a:44", "endpoint_id": 1, "available": true, @@ -645,22 +501,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:02:44:6a:44:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:02:44:6a:44", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-3ylew7b4-ts0601.json b/tests/data/devices/tze200-3ylew7b4-ts0601.json index 4ce18560c..dec134d54 100644 --- a/tests/data/devices/tze200-3ylew7b4-ts0601.json +++ b/tests/data/devices/tze200-3ylew7b4-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d2:40:50:25", "nwk": "0x46C0", "manufacturer": "_TZE200_3ylew7b4", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:40:50:25:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:40:50:25", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:40:50:25:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:40:50:25", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d2:40:50:25:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:40:50:25", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-4utwozi2-ts0601.json b/tests/data/devices/tze200-4utwozi2-ts0601.json index 22a18af02..85500e03a 100644 --- a/tests/data/devices/tze200-4utwozi2-ts0601.json +++ b/tests/data/devices/tze200-4utwozi2-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ed:f9:81:44", "nwk": "0xF615", "manufacturer": "_TZE200_4utwozi2", @@ -209,22 +209,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:ed:f9:81:44:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ed:f9:81:44", "endpoint_id": 1, "available": true, @@ -254,22 +238,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:ed:f9:81:44:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:ed:f9:81:44", "endpoint_id": 1, "available": true, @@ -333,22 +301,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:ed:f9:81:44:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ed:f9:81:44", "endpoint_id": 1, "available": true, @@ -382,22 +334,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ed:f9:81:44:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ed:f9:81:44", "endpoint_id": 1, "available": true, @@ -426,22 +362,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ed:f9:81:44:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ed:f9:81:44", "endpoint_id": 1, "available": true, @@ -470,22 +390,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:ed:f9:81:44:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:ed:f9:81:44", "endpoint_id": 1, "available": true, @@ -516,22 +420,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:ed:f9:81:44:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ed:f9:81:44", "endpoint_id": 1, "available": true, @@ -564,22 +452,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:ed:f9:81:44:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ed:f9:81:44", "endpoint_id": 1, "available": true, @@ -612,22 +484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:ed:f9:81:44:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ed:f9:81:44", "endpoint_id": 1, "available": true, @@ -662,22 +518,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ed:f9:81:44:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ed:f9:81:44", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-4wxtg5y9-ts0601.json b/tests/data/devices/tze200-4wxtg5y9-ts0601.json index 1e5f679df..2385b6f7b 100644 --- a/tests/data/devices/tze200-4wxtg5y9-ts0601.json +++ b/tests/data/devices/tze200-4wxtg5y9-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8b:f7:e2:fc", "nwk": "0x25E6", "manufacturer": "_TZE200_4wxtg5y9", @@ -206,22 +206,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8b:f7:e2:fc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8b:f7:e2:fc", "endpoint_id": 1, "available": true, @@ -250,22 +234,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8b:f7:e2:fc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8b:f7:e2:fc", "endpoint_id": 1, "available": true, @@ -296,22 +264,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8b:f7:e2:fc:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8b:f7:e2:fc", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-579lguh2-ts0601.json b/tests/data/devices/tze200-579lguh2-ts0601.json index 43d41eda0..d9e5e5a3e 100644 --- a/tests/data/devices/tze200-579lguh2-ts0601.json +++ b/tests/data/devices/tze200-579lguh2-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7e:7b:6f:42", "nwk": "0x8FF6", "manufacturer": "_TZE200_579lguh2", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7e:7b:6f:42:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7e:7b:6f:42", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7e:7b:6f:42:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7e:7b:6f:42", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:7e:7b:6f:42:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7e:7b:6f:42", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-68nvbio9-ts0601.json b/tests/data/devices/tze200-68nvbio9-ts0601.json index 4dce27436..dcb80a04f 100644 --- a/tests/data/devices/tze200-68nvbio9-ts0601.json +++ b/tests/data/devices/tze200-68nvbio9-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2e:21:db:80", "nwk": "0xAE0B", "manufacturer": "_TZE200_68nvbio9", @@ -305,22 +305,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:2e:21:db:80:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:2e:21:db:80", "endpoint_id": 1, "available": true, @@ -355,22 +339,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2e:21:db:80:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2e:21:db:80", "endpoint_id": 1, "available": true, @@ -399,22 +367,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2e:21:db:80:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2e:21:db:80", "endpoint_id": 1, "available": true, @@ -445,22 +397,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:2e:21:db:80:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2e:21:db:80", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-6rdj8dzm-ts0601.json b/tests/data/devices/tze200-6rdj8dzm-ts0601.json index 0d2c8ed45..12f61088d 100644 --- a/tests/data/devices/tze200-6rdj8dzm-ts0601.json +++ b/tests/data/devices/tze200-6rdj8dzm-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:00:a8:b8:ca", "nwk": "0xE5AF", "manufacturer": "_TZE200_6rdj8dzm", @@ -202,22 +202,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:00:a8:b8:ca:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:a8:b8:ca", "endpoint_id": 1, "available": true, @@ -247,22 +231,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:00:a8:b8:ca:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:00:a8:b8:ca", "endpoint_id": 1, "available": true, @@ -326,22 +294,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:00:a8:b8:ca:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:a8:b8:ca", "endpoint_id": 1, "available": true, @@ -375,22 +327,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:00:a8:b8:ca:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:a8:b8:ca", "endpoint_id": 1, "available": true, @@ -419,22 +355,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:00:a8:b8:ca:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:a8:b8:ca", "endpoint_id": 1, "available": true, @@ -463,22 +383,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:00:a8:b8:ca:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:00:a8:b8:ca", "endpoint_id": 1, "available": true, @@ -509,22 +413,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:00:a8:b8:ca:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:a8:b8:ca", "endpoint_id": 1, "available": true, @@ -557,22 +445,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:00:a8:b8:ca:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:a8:b8:ca", "endpoint_id": 1, "available": true, @@ -605,22 +477,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:00:a8:b8:ca:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:a8:b8:ca", "endpoint_id": 1, "available": true, @@ -655,22 +511,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:00:a8:b8:ca:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:00:a8:b8:ca", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-7bztmfm1-ts0601.json b/tests/data/devices/tze200-7bztmfm1-ts0601.json index 546a27e3c..09f962a29 100644 --- a/tests/data/devices/tze200-7bztmfm1-ts0601.json +++ b/tests/data/devices/tze200-7bztmfm1-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c2:d5:da:b7", "nwk": "0x1FFA", "manufacturer": "_TZE200_7bztmfm1", @@ -213,22 +213,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c2:d5:da:b7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c2:d5:da:b7", "endpoint_id": 1, "available": true, @@ -257,22 +241,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c2:d5:da:b7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c2:d5:da:b7", "endpoint_id": 1, "available": true, @@ -301,22 +269,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:c2:d5:da:b7:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c2:d5:da:b7", "endpoint_id": 1, "available": true, @@ -345,22 +297,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:c2:d5:da:b7:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c2:d5:da:b7", "endpoint_id": 1, "available": true, @@ -389,22 +325,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "CarbonDioxideConcentrationClusterHandler", - "generic_id": "cluster_handler_0x040d", - "endpoint_id": 1, - "cluster": { - "id": 1037, - "name": "Carbon Dioxide (CO\u2082) Concentration", - "type": "server" - }, - "id": "1:0x040d", - "unique_id": "ab:cd:ef:12:c2:d5:da:b7:1:0x040d", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c2:d5:da:b7", "endpoint_id": 1, "available": true, @@ -433,22 +353,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PM25ClusterHandler", - "generic_id": "cluster_handler_0x042a", - "endpoint_id": 1, - "cluster": { - "id": 1066, - "name": "PM2.5", - "type": "server" - }, - "id": "1:0x042a", - "unique_id": "ab:cd:ef:12:c2:d5:da:b7:1:0x042a", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c2:d5:da:b7", "endpoint_id": 1, "available": true, @@ -477,22 +381,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "FormaldehydeConcentrationClusterHandler", - "generic_id": "cluster_handler_0x042b", - "endpoint_id": 1, - "cluster": { - "id": 1067, - "name": "Formaldehyde Concentration", - "type": "server" - }, - "id": "1:0x042b", - "unique_id": "ab:cd:ef:12:c2:d5:da:b7:1:0x042b", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c2:d5:da:b7", "endpoint_id": 1, "available": true, @@ -521,22 +409,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0x042e", - "endpoint_id": 1, - "cluster": { - "id": 1070, - "name": "VOC Level", - "type": "server" - }, - "id": "1:0x042e", - "unique_id": "ab:cd:ef:12:c2:d5:da:b7:1:0x042e", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c2:d5:da:b7", "endpoint_id": 1, "available": true, @@ -567,22 +439,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c2:d5:da:b7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c2:d5:da:b7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-7iqgciln-ts0601.json b/tests/data/devices/tze200-7iqgciln-ts0601.json index f5bc073cf..4c495e033 100644 --- a/tests/data/devices/tze200-7iqgciln-ts0601.json +++ b/tests/data/devices/tze200-7iqgciln-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2a:c0:6c:7e", "nwk": "0x2A7F", "manufacturer": "_TZE200_7iqgciln", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2a:c0:6c:7e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2a:c0:6c:7e", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2a:c0:6c:7e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2a:c0:6c:7e", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:2a:c0:6c:7e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2a:c0:6c:7e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-7ytb3h8u-ts0601.json b/tests/data/devices/tze200-7ytb3h8u-ts0601.json index 8b0995fa4..f847205f5 100644 --- a/tests/data/devices/tze200-7ytb3h8u-ts0601.json +++ b/tests/data/devices/tze200-7ytb3h8u-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a1:d9:6c:74", "nwk": "0xBAE5", "manufacturer": "_TZE200_7ytb3h8u", @@ -278,22 +278,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -325,22 +309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -372,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -421,22 +373,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -468,22 +404,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -519,22 +439,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -563,22 +467,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -607,22 +495,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -658,22 +530,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaValveWaterConsumedNoInstDemand", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -709,22 +565,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -753,22 +593,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -797,22 +621,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -843,22 +651,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, @@ -887,22 +679,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a1:d9:6c:74:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a1:d9:6c:74", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-81isopgh-ts0601.json b/tests/data/devices/tze200-81isopgh-ts0601.json index 3ba0259f1..d302db145 100644 --- a/tests/data/devices/tze200-81isopgh-ts0601.json +++ b/tests/data/devices/tze200-81isopgh-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:df:e1:f9:56", "nwk": "0xBE36", "manufacturer": "_TZE200_81isopgh", @@ -308,22 +308,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:df:e1:f9:56:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:df:e1:f9:56", "endpoint_id": 1, "available": true, @@ -359,22 +343,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:df:e1:f9:56:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:df:e1:f9:56", "endpoint_id": 1, "available": true, @@ -403,22 +371,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:df:e1:f9:56:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:df:e1:f9:56", "endpoint_id": 1, "available": true, @@ -447,22 +399,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:df:e1:f9:56:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:df:e1:f9:56", "endpoint_id": 1, "available": true, @@ -498,22 +434,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaValveWaterConsumedNoInstDemand", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:df:e1:f9:56:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:df:e1:f9:56", "endpoint_id": 1, "available": true, @@ -549,22 +469,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:df:e1:f9:56:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:df:e1:f9:56", "endpoint_id": 1, "available": true, @@ -593,22 +497,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:df:e1:f9:56:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:df:e1:f9:56", "endpoint_id": 1, "available": true, @@ -637,22 +525,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:df:e1:f9:56:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:df:e1:f9:56", "endpoint_id": 1, "available": true, @@ -683,22 +555,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:df:e1:f9:56:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:df:e1:f9:56", "endpoint_id": 1, "available": true, @@ -727,22 +583,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:df:e1:f9:56:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:df:e1:f9:56", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-86nbew0j-ts0601.json b/tests/data/devices/tze200-86nbew0j-ts0601.json index 73d282c8a..8d9d1eb23 100644 --- a/tests/data/devices/tze200-86nbew0j-ts0601.json +++ b/tests/data/devices/tze200-86nbew0j-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:0d:c5:16:fc", "nwk": "0x0B79", "manufacturer": "_TZE200_86nbew0j", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0d:c5:16:fc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0d:c5:16:fc", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0d:c5:16:fc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0d:c5:16:fc", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:0d:c5:16:fc:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0d:c5:16:fc", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-8whfphjv-ts0601.json b/tests/data/devices/tze200-8whfphjv-ts0601.json index ccfb5e3a2..578669da2 100644 --- a/tests/data/devices/tze200-8whfphjv-ts0601.json +++ b/tests/data/devices/tze200-8whfphjv-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f9:05:90:9e", "nwk": "0xD7FA", "manufacturer": "_TZE200_8whfphjv", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f9:05:90:9e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:05:90:9e", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f9:05:90:9e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:05:90:9e", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f9:05:90:9e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f9:05:90:9e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-9caxna4s-ts0301.json b/tests/data/devices/tze200-9caxna4s-ts0301.json index b07332bd9..84fb46c82 100644 --- a/tests/data/devices/tze200-9caxna4s-ts0301.json +++ b/tests/data/devices/tze200-9caxna4s-ts0301.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "e8:e0:7e:ff:fe:4a:9c:f1", "nwk": "0x3B28", "manufacturer": "_TZE200_9caxna4s", @@ -246,22 +246,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "e8:e0:7e:ff:fe:4a:9c:f1:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "e8:e0:7e:ff:fe:4a:9c:f1", "endpoint_id": 1, "available": true, @@ -294,22 +278,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "e8:e0:7e:ff:fe:4a:9c:f1:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "e8:e0:7e:ff:fe:4a:9c:f1", "endpoint_id": 1, "available": true, @@ -344,22 +312,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "e8:e0:7e:ff:fe:4a:9c:f1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "e8:e0:7e:ff:fe:4a:9c:f1", "endpoint_id": 1, "available": true, @@ -388,22 +340,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "e8:e0:7e:ff:fe:4a:9c:f1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "e8:e0:7e:ff:fe:4a:9c:f1", "endpoint_id": 1, "available": true, @@ -432,22 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "e8:e0:7e:ff:fe:4a:9c:f1:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "e8:e0:7e:ff:fe:4a:9c:f1", "endpoint_id": 1, "available": true, @@ -482,22 +402,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "e8:e0:7e:ff:fe:4a:9c:f1:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "e8:e0:7e:ff:fe:4a:9c:f1", "endpoint_id": 1, "available": true, @@ -528,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "e8:e0:7e:ff:fe:4a:9c:f1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "e8:e0:7e:ff:fe:4a:9c:f1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-9xfjixap-ts0601.json b/tests/data/devices/tze200-9xfjixap-ts0601.json index d3f961990..f8bd10618 100644 --- a/tests/data/devices/tze200-9xfjixap-ts0601.json +++ b/tests/data/devices/tze200-9xfjixap-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ec:e3:cc:ac", "nwk": "0x4D03", "manufacturer": "_TZE200_9xfjixap", @@ -209,22 +209,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:ec:e3:cc:ac:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:e3:cc:ac", "endpoint_id": 1, "available": true, @@ -254,22 +238,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:ec:e3:cc:ac:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:ec:e3:cc:ac", "endpoint_id": 1, "available": true, @@ -333,22 +301,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:ec:e3:cc:ac:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:e3:cc:ac", "endpoint_id": 1, "available": true, @@ -382,22 +334,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ec:e3:cc:ac:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:e3:cc:ac", "endpoint_id": 1, "available": true, @@ -426,22 +362,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ec:e3:cc:ac:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:e3:cc:ac", "endpoint_id": 1, "available": true, @@ -470,22 +390,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:ec:e3:cc:ac:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:ec:e3:cc:ac", "endpoint_id": 1, "available": true, @@ -516,22 +420,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:ec:e3:cc:ac:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:e3:cc:ac", "endpoint_id": 1, "available": true, @@ -564,22 +452,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:ec:e3:cc:ac:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:e3:cc:ac", "endpoint_id": 1, "available": true, @@ -612,22 +484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:ec:e3:cc:ac:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:e3:cc:ac", "endpoint_id": 1, "available": true, @@ -662,22 +518,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ec:e3:cc:ac:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:e3:cc:ac", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-a0syesf5-ts0601.json b/tests/data/devices/tze200-a0syesf5-ts0601.json index 6bb73a8a7..6ba69fd37 100644 --- a/tests/data/devices/tze200-a0syesf5-ts0601.json +++ b/tests/data/devices/tze200-a0syesf5-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:68:ad:a9:bd", "nwk": "0xAA9B", "manufacturer": "_TZE200_a0syesf5", @@ -167,36 +167,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:68:ad:a9:bd:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:68:ad:a9:bd:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:68:ad:a9:bd", "endpoint_id": 1, "available": true, @@ -250,22 +220,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:68:ad:a9:bd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:68:ad:a9:bd", "endpoint_id": 1, "available": true, @@ -294,22 +248,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:68:ad:a9:bd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:68:ad:a9:bd", "endpoint_id": 1, "available": true, @@ -340,22 +278,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:68:ad:a9:bd:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:68:ad:a9:bd", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-a1dia7ml-ts0601.json b/tests/data/devices/tze200-a1dia7ml-ts0601.json index 23323b792..44668f91f 100644 --- a/tests/data/devices/tze200-a1dia7ml-ts0601.json +++ b/tests/data/devices/tze200-a1dia7ml-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b7:bf:3b:5a", "nwk": "0xE9D3", "manufacturer": "_TZE200_a1dia7ml", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b7:bf:3b:5a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b7:bf:3b:5a", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b7:bf:3b:5a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b7:bf:3b:5a", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b7:bf:3b:5a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b7:bf:3b:5a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-a7sghmms-ts0601.json b/tests/data/devices/tze200-a7sghmms-ts0601.json index 9d2cd95cc..0a80b4211 100644 --- a/tests/data/devices/tze200-a7sghmms-ts0601.json +++ b/tests/data/devices/tze200-a7sghmms-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b5:0f:0b:2f", "nwk": "0x5C8B", "manufacturer": "_TZE200_a7sghmms", @@ -284,22 +284,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -331,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -378,22 +346,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -427,22 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -474,22 +410,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -525,22 +445,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -569,22 +473,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -613,22 +501,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -664,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaValveWaterConsumedNoInstDemand", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -715,22 +571,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -759,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -803,22 +627,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -849,22 +657,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, @@ -893,22 +685,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b5:0f:0b:2f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b5:0f:0b:2f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-abatw3kj-ts0601.json b/tests/data/devices/tze200-abatw3kj-ts0601.json index fa22a96c7..b44e634b3 100644 --- a/tests/data/devices/tze200-abatw3kj-ts0601.json +++ b/tests/data/devices/tze200-abatw3kj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d4:15:fd:b1", "nwk": "0xA1E3", "manufacturer": "_TZE200_abatw3kj", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d4:15:fd:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:15:fd:b1", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d4:15:fd:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:15:fd:b1", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d4:15:fd:b1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:15:fd:b1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-agumlajc-ts0601.json b/tests/data/devices/tze200-agumlajc-ts0601.json index 175bd3cf9..13821c513 100644 --- a/tests/data/devices/tze200-agumlajc-ts0601.json +++ b/tests/data/devices/tze200-agumlajc-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:fb:2b:64:9f", "nwk": "0x11AB", "manufacturer": "_TZE200_agumlajc", @@ -202,22 +202,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fb:2b:64:9f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fb:2b:64:9f", "endpoint_id": 1, "available": true, @@ -246,22 +230,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fb:2b:64:9f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fb:2b:64:9f", "endpoint_id": 1, "available": true, @@ -292,22 +260,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:fb:2b:64:9f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fb:2b:64:9f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-akjefhj5-ts0601.json b/tests/data/devices/tze200-akjefhj5-ts0601.json index 5f91cc524..a193f461e 100644 --- a/tests/data/devices/tze200-akjefhj5-ts0601.json +++ b/tests/data/devices/tze200-akjefhj5-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:90:46:3c:81", "nwk": "0x6FFA", "manufacturer": "_TZE200_akjefhj5", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:90:46:3c:81:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:46:3c:81", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:90:46:3c:81:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:46:3c:81", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:90:46:3c:81:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:46:3c:81", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-aoclfnxz-ts0601.json b/tests/data/devices/tze200-aoclfnxz-ts0601.json index ea76a87e3..8752d91c4 100644 --- a/tests/data/devices/tze200-aoclfnxz-ts0601.json +++ b/tests/data/devices/tze200-aoclfnxz-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:33:78:02:42", "nwk": "0xE6E0", "manufacturer": "_TZE200_aoclfnxz", @@ -293,22 +293,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:33:78:02:42:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:33:78:02:42", "endpoint_id": 1, "available": true, @@ -372,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:33:78:02:42:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:78:02:42", "endpoint_id": 1, "available": true, @@ -424,22 +392,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:33:78:02:42:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:78:02:42", "endpoint_id": 1, "available": true, @@ -468,22 +420,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:33:78:02:42:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:78:02:42", "endpoint_id": 1, "available": true, @@ -512,22 +448,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:33:78:02:42:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:33:78:02:42", "endpoint_id": 1, "available": true, @@ -556,22 +476,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:33:78:02:42:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:33:78:02:42", "endpoint_id": 1, "available": true, @@ -600,22 +504,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:33:78:02:42:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:33:78:02:42", "endpoint_id": 1, "available": true, @@ -646,22 +534,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:33:78:02:42:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:33:78:02:42", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-b6wax7g0-ts0601.json b/tests/data/devices/tze200-b6wax7g0-ts0601.json index 4cd9993d5..869261719 100644 --- a/tests/data/devices/tze200-b6wax7g0-ts0601.json +++ b/tests/data/devices/tze200-b6wax7g0-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6b:27:4c:e0", "nwk": "0x6725", "manufacturer": "_TZE200_b6wax7g0", @@ -273,22 +273,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "MoesThermostatNew", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:6b:27:4c:e0:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:6b:27:4c:e0", "endpoint_id": 1, "available": true, @@ -358,22 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "MoesThermostatNew", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:6b:27:4c:e0:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:6b:27:4c:e0", "endpoint_id": 1, "available": true, @@ -407,22 +375,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6b:27:4c:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:27:4c:e0", "endpoint_id": 1, "available": true, @@ -451,22 +403,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6b:27:4c:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:27:4c:e0", "endpoint_id": 1, "available": true, @@ -495,22 +431,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:6b:27:4c:e0:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:6b:27:4c:e0", "endpoint_id": 1, "available": true, @@ -546,22 +466,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "MoesThermostatNew", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:6b:27:4c:e0:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:6b:27:4c:e0", "endpoint_id": 1, "available": true, @@ -590,22 +494,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "MoesThermostatNew", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:6b:27:4c:e0:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:6b:27:4c:e0", "endpoint_id": 1, "available": true, @@ -634,22 +522,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "MoesThermostatNew", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:6b:27:4c:e0:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:6b:27:4c:e0", "endpoint_id": 1, "available": true, @@ -678,22 +550,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "MoesThermostatNew", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:6b:27:4c:e0:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:6b:27:4c:e0", "endpoint_id": 1, "available": true, @@ -724,22 +580,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:6b:27:4c:e0:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:6b:27:4c:e0", "endpoint_id": 1, "available": true, @@ -768,22 +608,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6b:27:4c:e0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:27:4c:e0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-bcusnqt8-ts0601.json b/tests/data/devices/tze200-bcusnqt8-ts0601.json index e07237ce7..09385bcda 100644 --- a/tests/data/devices/tze200-bcusnqt8-ts0601.json +++ b/tests/data/devices/tze200-bcusnqt8-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:88:c9:0a:e7", "nwk": "0xBE6A", "manufacturer": "_TZE200_bcusnqt8", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:88:c9:0a:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:88:c9:0a:e7", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:88:c9:0a:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:88:c9:0a:e7", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:88:c9:0a:e7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:88:c9:0a:e7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-bkkmqmyo-ts0601.json b/tests/data/devices/tze200-bkkmqmyo-ts0601.json index 0113f2e77..3bf882456 100644 --- a/tests/data/devices/tze200-bkkmqmyo-ts0601.json +++ b/tests/data/devices/tze200-bkkmqmyo-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ab:88:33:32", "nwk": "0x37E6", "manufacturer": "_TZE200_bkkmqmyo", @@ -579,22 +579,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ab:88:33:32:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:88:33:32", "endpoint_id": 1, "available": true, @@ -623,22 +607,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ab:88:33:32:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:88:33:32", "endpoint_id": 1, "available": true, @@ -667,22 +635,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaElectricalMeasurement", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:ab:88:33:32:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:ab:88:33:32", "endpoint_id": 1, "available": true, @@ -717,22 +669,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaElectricalMeasurement", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:ab:88:33:32:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:ab:88:33:32", "endpoint_id": 1, "available": true, @@ -758,7 +694,7 @@ "unique_id": "ab:cd:ef:12:ab:88:33:32-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -767,22 +703,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ab:88:33:32:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ab:88:33:32", "endpoint_id": 1, "available": true, @@ -791,7 +711,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 8.0 }, @@ -815,22 +735,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ab:88:33:32:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ab:88:33:32", "endpoint_id": 1, "available": true, @@ -863,22 +767,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ab:88:33:32:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ab:88:33:32", "endpoint_id": 1, "available": true, @@ -912,22 +800,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 16, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "16:0x0006", - "unique_id": "ab:cd:ef:12:ab:88:33:32:16:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ab:88:33:32", "endpoint_id": 16, "available": true, @@ -956,22 +828,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ab:88:33:32:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ab:88:33:32", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-bvrlmajk-ts0601.json b/tests/data/devices/tze200-bvrlmajk-ts0601.json index 74273100a..0366c4be3 100644 --- a/tests/data/devices/tze200-bvrlmajk-ts0601.json +++ b/tests/data/devices/tze200-bvrlmajk-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:25:62:e5:8a", "nwk": "0xB59B", "manufacturer": "_TZE200_bvrlmajk", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:25:62:e5:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:62:e5:8a", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:25:62:e5:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:62:e5:8a", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:25:62:e5:8a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:62:e5:8a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-byzdayie-ts0601.json b/tests/data/devices/tze200-byzdayie-ts0601.json index dbf576e1b..2b999c2c0 100644 --- a/tests/data/devices/tze200-byzdayie-ts0601.json +++ b/tests/data/devices/tze200-byzdayie-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d9:70:11:36", "nwk": "0x6F79", "manufacturer": "_TZE200_byzdayie", @@ -513,22 +513,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d9:70:11:36:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:70:11:36", "endpoint_id": 1, "available": true, @@ -557,22 +541,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d9:70:11:36:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:70:11:36", "endpoint_id": 1, "available": true, @@ -601,22 +569,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:d9:70:11:36:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:d9:70:11:36", "endpoint_id": 1, "available": true, @@ -642,7 +594,7 @@ "unique_id": "ab:cd:ef:12:d9:70:11:36-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -651,22 +603,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:d9:70:11:36:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:d9:70:11:36", "endpoint_id": 1, "available": true, @@ -675,7 +611,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 184.8 }, @@ -699,22 +635,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:d9:70:11:36:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:d9:70:11:36", "endpoint_id": 1, "available": true, @@ -747,22 +667,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:d9:70:11:36:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:d9:70:11:36", "endpoint_id": 1, "available": true, @@ -797,22 +701,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d9:70:11:36:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:70:11:36", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-c88teujp-ts0601.json b/tests/data/devices/tze200-c88teujp-ts0601.json index 5d6c9b523..3b628a0b9 100644 --- a/tests/data/devices/tze200-c88teujp-ts0601.json +++ b/tests/data/devices/tze200-c88teujp-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f0:e2:89:82", "nwk": "0xDF16", "manufacturer": "_TZE200_c88teujp", @@ -276,22 +276,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -321,22 +305,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2NoSchedule", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -400,22 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -449,22 +401,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -493,22 +429,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -537,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2NoSchedule", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -581,22 +485,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -627,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -675,22 +547,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -723,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -771,22 +611,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -819,22 +643,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -867,22 +675,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, @@ -917,22 +709,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f0:e2:89:82:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:e2:89:82", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-cirvgep4-ts0601.json b/tests/data/devices/tze200-cirvgep4-ts0601.json index 5221fa671..f475a9b87 100644 --- a/tests/data/devices/tze200-cirvgep4-ts0601.json +++ b/tests/data/devices/tze200-cirvgep4-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:3d:fa:1c:a8", "nwk": "0xC5AC", "manufacturer": "_TZE200_cirvgep4", @@ -200,22 +200,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:3d:fa:1c:a8:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3d:fa:1c:a8", "endpoint_id": 1, "available": true, @@ -249,22 +233,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3d:fa:1c:a8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3d:fa:1c:a8", "endpoint_id": 1, "available": true, @@ -293,22 +261,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3d:fa:1c:a8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3d:fa:1c:a8", "endpoint_id": 1, "available": true, @@ -337,22 +289,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:3d:fa:1c:a8:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:3d:fa:1c:a8", "endpoint_id": 1, "available": true, @@ -388,22 +324,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:3d:fa:1c:a8:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:3d:fa:1c:a8", "endpoint_id": 1, "available": true, @@ -432,22 +352,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:3d:fa:1c:a8:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:3d:fa:1c:a8", "endpoint_id": 1, "available": true, @@ -478,22 +382,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:3d:fa:1c:a8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3d:fa:1c:a8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-cpbo62rn-ts0601.json b/tests/data/devices/tze200-cpbo62rn-ts0601.json index 530b22508..79c4acb7a 100644 --- a/tests/data/devices/tze200-cpbo62rn-ts0601.json +++ b/tests/data/devices/tze200-cpbo62rn-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b3:c5:e5:3a", "nwk": "0xB9A4", "manufacturer": "_TZE200_cpbo62rn", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:b3:c5:e5:3a:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:b3:c5:e5:3a", "endpoint_id": 1, "available": true, @@ -210,22 +194,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b3:c5:e5:3a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b3:c5:e5:3a", "endpoint_id": 1, "available": true, @@ -254,22 +222,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b3:c5:e5:3a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b3:c5:e5:3a", "endpoint_id": 1, "available": true, @@ -298,22 +250,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:b3:c5:e5:3a:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:b3:c5:e5:3a", "endpoint_id": 1, "available": true, @@ -344,22 +280,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b3:c5:e5:3a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b3:c5:e5:3a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-cpmgn2cf-ts0601.json b/tests/data/devices/tze200-cpmgn2cf-ts0601.json index 06b2abfa6..f20170553 100644 --- a/tests/data/devices/tze200-cpmgn2cf-ts0601.json +++ b/tests/data/devices/tze200-cpmgn2cf-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e8:32:c6:e4", "nwk": "0xECD7", "manufacturer": "_TZE200_cpmgn2cf", @@ -965,22 +965,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 1, "available": true, @@ -1051,22 +1035,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 1, "available": true, @@ -1098,22 +1066,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 10, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "10:0x000d", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:10:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 10, "available": true, @@ -1145,22 +1097,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 11, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "11:0x000d", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:11:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 11, "available": true, @@ -1192,22 +1128,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 3, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "3:0x000d", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:3:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 3, "available": true, @@ -1239,22 +1159,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 4, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "4:0x000d", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:4:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 4, "available": true, @@ -1286,22 +1190,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 5, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "5:0x000d", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:5:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 5, "available": true, @@ -1333,22 +1221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 7, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "7:0x000d", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:7:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 7, "available": true, @@ -1380,22 +1252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 8, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "8:0x000d", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:8:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 8, "available": true, @@ -1427,22 +1283,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 9, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "9:0x000d", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:9:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 9, "available": true, @@ -1476,22 +1316,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 1, "available": true, @@ -1528,22 +1352,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 1, "available": true, @@ -1572,22 +1380,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 1, "available": true, @@ -1616,22 +1408,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 1, "available": true, @@ -1665,22 +1441,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 1, "available": true, @@ -1709,22 +1469,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 1, "available": true, @@ -1753,22 +1497,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 1, "available": true, @@ -1799,22 +1527,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 1, "available": true, @@ -1843,22 +1555,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e8:32:c6:e4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e8:32:c6:e4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-crq3r3la-ck-bl702-mws-01-7016.json b/tests/data/devices/tze200-crq3r3la-ck-bl702-mws-01-7016.json index e1cc5c66b..055da7fc9 100644 --- a/tests/data/devices/tze200-crq3r3la-ck-bl702-mws-01-7016.json +++ b/tests/data/devices/tze200-crq3r3la-ck-bl702-mws-01-7016.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:36:6f:df:00", "nwk": "0xA02D", "manufacturer": "_TZE200_crq3r3la", @@ -244,22 +244,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -287,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -332,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -380,22 +332,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -427,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -474,22 +394,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -521,22 +425,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -568,22 +456,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -615,22 +487,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -662,22 +518,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -711,22 +551,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -764,22 +588,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -808,22 +616,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -852,22 +644,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -898,22 +674,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, @@ -948,22 +708,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:36:6f:df:00:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:36:6f:df:00", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-dwcarsat-ts0601.json b/tests/data/devices/tze200-dwcarsat-ts0601.json index e8399460a..967a34e2b 100644 --- a/tests/data/devices/tze200-dwcarsat-ts0601.json +++ b/tests/data/devices/tze200-dwcarsat-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:11:fa:9c:20", "nwk": "0x2C73", "manufacturer": "_TZE200_dwcarsat", @@ -313,22 +313,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:11:fa:9c:20:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:11:fa:9c:20", "endpoint_id": 1, "available": true, @@ -357,22 +341,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:11:fa:9c:20:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:11:fa:9c:20", "endpoint_id": 1, "available": true, @@ -401,22 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:11:fa:9c:20:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:11:fa:9c:20", "endpoint_id": 1, "available": true, @@ -445,22 +397,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:11:fa:9c:20:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:11:fa:9c:20", "endpoint_id": 1, "available": true, @@ -489,22 +425,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "CarbonDioxideConcentrationClusterHandler", - "generic_id": "cluster_handler_0x040d", - "endpoint_id": 1, - "cluster": { - "id": 1037, - "name": "Carbon Dioxide (CO\u2082) Concentration", - "type": "server" - }, - "id": "1:0x040d", - "unique_id": "ab:cd:ef:12:11:fa:9c:20:1:0x040d", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:11:fa:9c:20", "endpoint_id": 1, "available": true, @@ -533,22 +453,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PM25ClusterHandler", - "generic_id": "cluster_handler_0x042a", - "endpoint_id": 1, - "cluster": { - "id": 1066, - "name": "PM2.5", - "type": "server" - }, - "id": "1:0x042a", - "unique_id": "ab:cd:ef:12:11:fa:9c:20:1:0x042a", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:11:fa:9c:20", "endpoint_id": 1, "available": true, @@ -577,22 +481,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "FormaldehydeConcentrationClusterHandler", - "generic_id": "cluster_handler_0x042b", - "endpoint_id": 1, - "cluster": { - "id": 1067, - "name": "Formaldehyde Concentration", - "type": "server" - }, - "id": "1:0x042b", - "unique_id": "ab:cd:ef:12:11:fa:9c:20:1:0x042b", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:11:fa:9c:20", "endpoint_id": 1, "available": true, @@ -621,22 +509,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0x042e", - "endpoint_id": 1, - "cluster": { - "id": 1070, - "name": "VOC Level", - "type": "server" - }, - "id": "1:0x042e", - "unique_id": "ab:cd:ef:12:11:fa:9c:20:1:0x042e", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:11:fa:9c:20", "endpoint_id": 1, "available": true, @@ -667,22 +539,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:11:fa:9c:20:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:11:fa:9c:20", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-e5hpkc6d-ts0601.json b/tests/data/devices/tze200-e5hpkc6d-ts0601.json index f1edd03a3..199132bba 100644 --- a/tests/data/devices/tze200-e5hpkc6d-ts0601.json +++ b/tests/data/devices/tze200-e5hpkc6d-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:0f:8f:90:d6", "nwk": "0xDA91", "manufacturer": "_TZE200_e5hpkc6d", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0f:8f:90:d6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0f:8f:90:d6", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0f:8f:90:d6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0f:8f:90:d6", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:0f:8f:90:d6:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0f:8f:90:d6", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-eevqq1uv-ts0601.json b/tests/data/devices/tze200-eevqq1uv-ts0601.json index 9687d1c57..8f83ce1e8 100644 --- a/tests/data/devices/tze200-eevqq1uv-ts0601.json +++ b/tests/data/devices/tze200-eevqq1uv-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e7:77:2b:fd", "nwk": "0x4C47", "manufacturer": "_TZE200_eevqq1uv", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:77:2b:fd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:77:2b:fd", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:77:2b:fd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:77:2b:fd", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e7:77:2b:fd:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:77:2b:fd", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-ewxhg6o9-ts0601.json b/tests/data/devices/tze200-ewxhg6o9-ts0601.json index ace580e50..85d0d4d10 100644 --- a/tests/data/devices/tze200-ewxhg6o9-ts0601.json +++ b/tests/data/devices/tze200-ewxhg6o9-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5e:6a:9a:13", "nwk": "0xA759", "manufacturer": "_TZE200_ewxhg6o9", @@ -451,22 +451,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:6a:9a:13:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:6a:9a:13", "endpoint_id": 1, "available": true, @@ -495,22 +479,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:6a:9a:13:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:6a:9a:13", "endpoint_id": 1, "available": true, @@ -539,22 +507,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:5e:6a:9a:13:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:5e:6a:9a:13", "endpoint_id": 1, "available": true, @@ -580,7 +532,7 @@ "unique_id": "ab:cd:ef:12:5e:6a:9a:13-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -589,22 +541,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:5e:6a:9a:13:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:5e:6a:9a:13", "endpoint_id": 1, "available": true, @@ -613,7 +549,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 52.8 }, @@ -637,22 +573,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:5e:6a:9a:13:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:5e:6a:9a:13", "endpoint_id": 1, "available": true, @@ -685,22 +605,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:5e:6a:9a:13:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:5e:6a:9a:13", "endpoint_id": 1, "available": true, @@ -735,22 +639,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5e:6a:9a:13:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:6a:9a:13", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-f1pvdgoh-ts0601.json b/tests/data/devices/tze200-f1pvdgoh-ts0601.json index 179a10b45..df9652667 100644 --- a/tests/data/devices/tze200-f1pvdgoh-ts0601.json +++ b/tests/data/devices/tze200-f1pvdgoh-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6f:fa:d5:b9", "nwk": "0xB27C", "manufacturer": "_TZE200_f1pvdgoh", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6f:fa:d5:b9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:fa:d5:b9", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6f:fa:d5:b9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:fa:d5:b9", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6f:fa:d5:b9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:fa:d5:b9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-fvldku9h-ts0601.json b/tests/data/devices/tze200-fvldku9h-ts0601.json index 778989b50..0b94e4456 100644 --- a/tests/data/devices/tze200-fvldku9h-ts0601.json +++ b/tests/data/devices/tze200-fvldku9h-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f6:ec:90:fb", "nwk": "0x4092", "manufacturer": "_TZE200_fvldku9h", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f6:ec:90:fb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f6:ec:90:fb", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f6:ec:90:fb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f6:ec:90:fb", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f6:ec:90:fb:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f6:ec:90:fb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-g9a3awaj-ts0601.json b/tests/data/devices/tze200-g9a3awaj-ts0601.json index 745b4d5f6..b28a76571 100644 --- a/tests/data/devices/tze200-g9a3awaj-ts0601.json +++ b/tests/data/devices/tze200-g9a3awaj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5c:5d:1b:5a", "nwk": "0x8453", "manufacturer": "_TZE200_g9a3awaj", @@ -324,22 +324,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:5d:1b:5a:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:5d:1b:5a", "endpoint_id": 1, "available": true, @@ -403,22 +387,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5c:5d:1b:5a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:5d:1b:5a", "endpoint_id": 1, "available": true, @@ -447,22 +415,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5c:5d:1b:5a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:5d:1b:5a", "endpoint_id": 1, "available": true, @@ -491,22 +443,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:5d:1b:5a:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:5d:1b:5a", "endpoint_id": 1, "available": true, @@ -535,22 +471,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:5c:5d:1b:5a:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:5c:5d:1b:5a", "endpoint_id": 1, "available": true, @@ -581,22 +501,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5c:5d:1b:5a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:5d:1b:5a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-gaj531w3-ts0601.json b/tests/data/devices/tze200-gaj531w3-ts0601.json index e879f46d2..f916fb92f 100644 --- a/tests/data/devices/tze200-gaj531w3-ts0601.json +++ b/tests/data/devices/tze200-gaj531w3-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:30:0c:e3:f9", "nwk": "0x3F77", "manufacturer": "_TZE200_gaj531w3", @@ -207,22 +207,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:30:0c:e3:f9:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:30:0c:e3:f9", "endpoint_id": 1, "available": true, @@ -257,22 +241,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:30:0c:e3:f9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:30:0c:e3:f9", "endpoint_id": 1, "available": true, @@ -301,22 +269,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:30:0c:e3:f9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:30:0c:e3:f9", "endpoint_id": 1, "available": true, @@ -347,22 +299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:30:0c:e3:f9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:30:0c:e3:f9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-gjldowol-ts0601.json b/tests/data/devices/tze200-gjldowol-ts0601.json index 46d8912e9..2d9e21646 100644 --- a/tests/data/devices/tze200-gjldowol-ts0601.json +++ b/tests/data/devices/tze200-gjldowol-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c3:87:c2:4d", "nwk": "0x594E", "manufacturer": "_TZE200_gjldowol", @@ -180,22 +180,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:c3:87:c2:4d:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:c3:87:c2:4d", "endpoint_id": 1, "available": true, @@ -225,22 +209,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c3:87:c2:4d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:87:c2:4d", "endpoint_id": 1, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c3:87:c2:4d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:87:c2:4d", "endpoint_id": 1, "available": true, @@ -321,22 +273,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c3:87:c2:4d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:87:c2:4d", "endpoint_id": 1, "available": true, @@ -371,22 +307,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c3:87:c2:4d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:87:c2:4d", "endpoint_id": 1, "available": true, @@ -415,22 +335,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c3:87:c2:4d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:87:c2:4d", "endpoint_id": 1, "available": true, @@ -459,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:c3:87:c2:4d:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:c3:87:c2:4d", "endpoint_id": 1, "available": true, @@ -510,22 +398,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:c3:87:c2:4d:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c3:87:c2:4d", "endpoint_id": 1, "available": true, @@ -556,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c3:87:c2:4d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:87:c2:4d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-gkfbdvyx-ts0601.json b/tests/data/devices/tze200-gkfbdvyx-ts0601.json index 3629d5547..a15b26686 100644 --- a/tests/data/devices/tze200-gkfbdvyx-ts0601.json +++ b/tests/data/devices/tze200-gkfbdvyx-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5a:b5:b3:b3", "nwk": "0x7E1C", "manufacturer": "_TZE200_gkfbdvyx", @@ -146,22 +146,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:5a:b5:b3:b3:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:5a:b5:b3:b3", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5a:b5:b3:b3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:b5:b3:b3", "endpoint_id": 1, "available": true, @@ -238,22 +206,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5a:b5:b3:b3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:b5:b3:b3", "endpoint_id": 1, "available": true, @@ -285,22 +237,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5a:b5:b3:b3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:b5:b3:b3", "endpoint_id": 1, "available": true, @@ -332,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5a:b5:b3:b3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:b5:b3:b3", "endpoint_id": 1, "available": true, @@ -379,22 +299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5a:b5:b3:b3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:b5:b3:b3", "endpoint_id": 1, "available": true, @@ -428,22 +332,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5a:b5:b3:b3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:b5:b3:b3", "endpoint_id": 1, "available": true, @@ -472,22 +360,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5a:b5:b3:b3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:b5:b3:b3", "endpoint_id": 1, "available": true, @@ -516,22 +388,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:5a:b5:b3:b3:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:5a:b5:b3:b3", "endpoint_id": 1, "available": true, @@ -560,22 +416,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5a:b5:b3:b3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:b5:b3:b3", "endpoint_id": 1, "available": true, @@ -606,22 +446,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5a:b5:b3:b3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:b5:b3:b3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-gubdgai2-ts0601.json b/tests/data/devices/tze200-gubdgai2-ts0601.json index e9bf3014b..198670ee0 100644 --- a/tests/data/devices/tze200-gubdgai2-ts0601.json +++ b/tests/data/devices/tze200-gubdgai2-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e5:a7:00:54", "nwk": "0x5989", "manufacturer": "_TZE200_gubdgai2", @@ -172,22 +172,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:e5:a7:00:54:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:e5:a7:00:54", "endpoint_id": 1, "available": true, @@ -222,22 +206,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e5:a7:00:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:a7:00:54", "endpoint_id": 1, "available": true, @@ -266,22 +234,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e5:a7:00:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:a7:00:54", "endpoint_id": 1, "available": true, @@ -310,22 +262,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:e5:a7:00:54:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:e5:a7:00:54", "endpoint_id": 1, "available": true, @@ -356,22 +292,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e5:a7:00:54:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e5:a7:00:54", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-guvc7pdy-ts0601.json b/tests/data/devices/tze200-guvc7pdy-ts0601.json index a1bfdff8c..056c2de01 100644 --- a/tests/data/devices/tze200-guvc7pdy-ts0601.json +++ b/tests/data/devices/tze200-guvc7pdy-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:93:c9:f7:0f", "nwk": "0x88D1", "manufacturer": "_TZE200_guvc7pdy", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:93:c9:f7:0f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:c9:f7:0f", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:93:c9:f7:0f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:c9:f7:0f", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:93:c9:f7:0f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:c9:f7:0f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-h4cgnbzg-ts0601.json b/tests/data/devices/tze200-h4cgnbzg-ts0601.json index e4bf1c5fa..53e6b9630 100644 --- a/tests/data/devices/tze200-h4cgnbzg-ts0601.json +++ b/tests/data/devices/tze200-h4cgnbzg-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d1:91:b1:8f", "nwk": "0xC179", "manufacturer": "_TZE200_h4cgnbzg", @@ -236,22 +236,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d1:91:b1:8f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:91:b1:8f", "endpoint_id": 1, "available": true, @@ -281,22 +265,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2NoSchedule", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:91:b1:8f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:91:b1:8f", "endpoint_id": 1, "available": true, @@ -360,22 +328,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d1:91:b1:8f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:91:b1:8f", "endpoint_id": 1, "available": true, @@ -409,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2NoSchedule", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:d1:91:b1:8f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:d1:91:b1:8f", "endpoint_id": 1, "available": true, @@ -453,22 +389,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d1:91:b1:8f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:91:b1:8f", "endpoint_id": 1, "available": true, @@ -499,22 +419,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d1:91:b1:8f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:91:b1:8f", "endpoint_id": 1, "available": true, @@ -547,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d1:91:b1:8f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:91:b1:8f", "endpoint_id": 1, "available": true, @@ -595,22 +483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d1:91:b1:8f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:91:b1:8f", "endpoint_id": 1, "available": true, @@ -643,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d1:91:b1:8f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:91:b1:8f", "endpoint_id": 1, "available": true, @@ -691,22 +547,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d1:91:b1:8f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:91:b1:8f", "endpoint_id": 1, "available": true, @@ -739,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d1:91:b1:8f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:91:b1:8f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-hhrtiq0x-ts0601.json b/tests/data/devices/tze200-hhrtiq0x-ts0601.json index 3f3a3b482..a4659347f 100644 --- a/tests/data/devices/tze200-hhrtiq0x-ts0601.json +++ b/tests/data/devices/tze200-hhrtiq0x-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:9a:53:ef:5b", "nwk": "0x9F96", "manufacturer": "_TZE200_hhrtiq0x", @@ -247,22 +247,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9a:53:ef:5b:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9a:53:ef:5b", "endpoint_id": 1, "available": true, @@ -326,22 +310,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:9a:53:ef:5b:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9a:53:ef:5b", "endpoint_id": 1, "available": true, @@ -378,22 +346,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9a:53:ef:5b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9a:53:ef:5b", "endpoint_id": 1, "available": true, @@ -422,22 +374,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9a:53:ef:5b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9a:53:ef:5b", "endpoint_id": 1, "available": true, @@ -466,22 +402,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:9a:53:ef:5b:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:9a:53:ef:5b", "endpoint_id": 1, "available": true, @@ -517,22 +437,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9a:53:ef:5b:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9a:53:ef:5b", "endpoint_id": 1, "available": true, @@ -561,22 +465,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9a:53:ef:5b:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9a:53:ef:5b", "endpoint_id": 1, "available": true, @@ -605,22 +493,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9a:53:ef:5b:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9a:53:ef:5b", "endpoint_id": 1, "available": true, @@ -649,22 +521,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9a:53:ef:5b:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9a:53:ef:5b", "endpoint_id": 1, "available": true, @@ -695,22 +551,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:9a:53:ef:5b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9a:53:ef:5b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-hl0ss9oa-ts0225.json b/tests/data/devices/tze200-hl0ss9oa-ts0225.json index 831dd2464..da90ff81d 100644 --- a/tests/data/devices/tze200-hl0ss9oa-ts0225.json +++ b/tests/data/devices/tze200-hl0ss9oa-ts0225.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ea:02:c4:e2", "nwk": "0xEC5D", "manufacturer": "_TZE200_hl0ss9oa", @@ -233,22 +233,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:ea:02:c4:e2:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:02:c4:e2", "endpoint_id": 1, "available": true, @@ -278,22 +262,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ea:02:c4:e2:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:02:c4:e2", "endpoint_id": 1, "available": true, @@ -326,22 +294,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ea:02:c4:e2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:02:c4:e2", "endpoint_id": 1, "available": true, @@ -370,22 +322,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ea:02:c4:e2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ea:02:c4:e2", "endpoint_id": 1, "available": true, @@ -414,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:ea:02:c4:e2:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:ea:02:c4:e2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-hr0tdd47-ts0601.json b/tests/data/devices/tze200-hr0tdd47-ts0601.json index 53742dc6f..465142048 100644 --- a/tests/data/devices/tze200-hr0tdd47-ts0601.json +++ b/tests/data/devices/tze200-hr0tdd47-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:22:50:2b:09", "nwk": "0x38BA", "manufacturer": "_TZE200_hr0tdd47", @@ -192,22 +192,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:22:50:2b:09:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:50:2b:09", "endpoint_id": 1, "available": true, @@ -237,22 +221,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:50:2b:09:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:50:2b:09", "endpoint_id": 1, "available": true, @@ -281,22 +249,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:50:2b:09:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:50:2b:09", "endpoint_id": 1, "available": true, @@ -325,22 +277,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:22:50:2b:09:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:22:50:2b:09", "endpoint_id": 1, "available": true, @@ -376,22 +312,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:22:50:2b:09:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:50:2b:09", "endpoint_id": 1, "available": true, @@ -420,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:22:50:2b:09:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:50:2b:09", "endpoint_id": 1, "available": true, @@ -466,22 +370,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:22:50:2b:09:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:50:2b:09", "endpoint_id": 1, "available": true, @@ -516,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:22:50:2b:09:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:50:2b:09", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-iba1ckek-ts0601.json b/tests/data/devices/tze200-iba1ckek-ts0601.json index 93718ad55..93f55d8e1 100644 --- a/tests/data/devices/tze200-iba1ckek-ts0601.json +++ b/tests/data/devices/tze200-iba1ckek-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7c:6f:df:00", "nwk": "0x9EA5", "manufacturer": "_TZE200_iba1ckek", @@ -186,22 +186,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:7c:6f:df:00:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7c:6f:df:00", "endpoint_id": 1, "available": true, @@ -231,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:7c:6f:df:00:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7c:6f:df:00", "endpoint_id": 1, "available": true, @@ -279,22 +247,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7c:6f:df:00:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7c:6f:df:00", "endpoint_id": 1, "available": true, @@ -323,22 +275,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7c:6f:df:00:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7c:6f:df:00", "endpoint_id": 1, "available": true, @@ -367,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:7c:6f:df:00:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:7c:6f:df:00", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-icka1clh-ts0601.json b/tests/data/devices/tze200-icka1clh-ts0601.json index c9978c75a..90ea431b8 100644 --- a/tests/data/devices/tze200-icka1clh-ts0601.json +++ b/tests/data/devices/tze200-icka1clh-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8b:0c:ae:49", "nwk": "0xAC3C", "manufacturer": "_TZE200_icka1clh", @@ -207,22 +207,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:8b:0c:ae:49:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:8b:0c:ae:49", "endpoint_id": 1, "available": true, @@ -257,22 +241,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8b:0c:ae:49:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8b:0c:ae:49", "endpoint_id": 1, "available": true, @@ -301,22 +269,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8b:0c:ae:49:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8b:0c:ae:49", "endpoint_id": 1, "available": true, @@ -347,22 +299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8b:0c:ae:49:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8b:0c:ae:49", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-ijey4q29-ts0601.json b/tests/data/devices/tze200-ijey4q29-ts0601.json index a47cda707..abc831bc8 100644 --- a/tests/data/devices/tze200-ijey4q29-ts0601.json +++ b/tests/data/devices/tze200-ijey4q29-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4e:54:99:b8", "nwk": "0x6D0B", "manufacturer": "_TZE200_ijey4q29", @@ -211,22 +211,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:4e:54:99:b8:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:54:99:b8", "endpoint_id": 1, "available": true, @@ -256,22 +240,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:4e:54:99:b8:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:54:99:b8", "endpoint_id": 1, "available": true, @@ -304,22 +272,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4e:54:99:b8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:54:99:b8", "endpoint_id": 1, "available": true, @@ -348,22 +300,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4e:54:99:b8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:54:99:b8", "endpoint_id": 1, "available": true, @@ -392,22 +328,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:4e:54:99:b8:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:4e:54:99:b8", "endpoint_id": 1, "available": true, @@ -442,22 +362,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:4e:54:99:b8:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:4e:54:99:b8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-iuk8kupi-ts0601.json b/tests/data/devices/tze200-iuk8kupi-ts0601.json index 43e77d559..6c2e0a47a 100644 --- a/tests/data/devices/tze200-iuk8kupi-ts0601.json +++ b/tests/data/devices/tze200-iuk8kupi-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:fa:ce:89:0c", "nwk": "0x9D92", "manufacturer": "_TZE200_iuk8kupi", @@ -170,22 +170,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fa:ce:89:0c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:ce:89:0c", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fa:ce:89:0c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:ce:89:0c", "endpoint_id": 1, "available": true, @@ -260,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:fa:ce:89:0c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:ce:89:0c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-js3mgbjb-ts0601.json b/tests/data/devices/tze200-js3mgbjb-ts0601.json index d3c2528a9..60bc383a6 100644 --- a/tests/data/devices/tze200-js3mgbjb-ts0601.json +++ b/tests/data/devices/tze200-js3mgbjb-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6d:3e:31:b1", "nwk": "0xF76A", "manufacturer": "_TZE200_js3mgbjb", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6d:3e:31:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6d:3e:31:b1", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6d:3e:31:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6d:3e:31:b1", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6d:3e:31:b1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6d:3e:31:b1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-jva8ink8-ts0601.json b/tests/data/devices/tze200-jva8ink8-ts0601.json index 8c0b717c5..f02d69c38 100644 --- a/tests/data/devices/tze200-jva8ink8-ts0601.json +++ b/tests/data/devices/tze200-jva8ink8-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:9e:63:48:2b", "nwk": "0xC942", "manufacturer": "_TZE200_jva8ink8", @@ -259,22 +259,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, @@ -304,22 +288,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, @@ -351,22 +319,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, @@ -398,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, @@ -445,22 +381,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, @@ -494,22 +414,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, @@ -538,22 +442,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, @@ -582,22 +470,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, @@ -626,22 +498,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, @@ -670,22 +526,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, @@ -716,22 +556,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, @@ -766,22 +590,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:9e:63:48:2b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9e:63:48:2b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-jwsjbxjs-ts0601.json b/tests/data/devices/tze200-jwsjbxjs-ts0601.json index 84177ae14..4e58d4d29 100644 --- a/tests/data/devices/tze200-jwsjbxjs-ts0601.json +++ b/tests/data/devices/tze200-jwsjbxjs-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:53:b6:3a:a2", "nwk": "0xC1A7", "manufacturer": "_TZE200_jwsjbxjs", @@ -307,22 +307,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:53:b6:3a:a2:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:53:b6:3a:a2", "endpoint_id": 1, "available": true, @@ -373,22 +357,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:53:b6:3a:a2:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:53:b6:3a:a2", "endpoint_id": 2, "available": true, @@ -439,22 +407,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:53:b6:3a:a2:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:53:b6:3a:a2", "endpoint_id": 3, "available": true, @@ -505,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:53:b6:3a:a2:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:53:b6:3a:a2", "endpoint_id": 4, "available": true, @@ -571,22 +507,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 5, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "5:0x0006", - "unique_id": "ab:cd:ef:12:53:b6:3a:a2:5:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:53:b6:3a:a2", "endpoint_id": 5, "available": true, @@ -639,22 +559,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:53:b6:3a:a2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:53:b6:3a:a2", "endpoint_id": 1, "available": true, @@ -683,22 +587,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:53:b6:3a:a2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:53:b6:3a:a2", "endpoint_id": 1, "available": true, @@ -729,22 +617,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:53:b6:3a:a2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:53:b6:3a:a2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-kb5noeto-ts0601.json b/tests/data/devices/tze200-kb5noeto-ts0601.json index 4b53f8886..d6b520371 100644 --- a/tests/data/devices/tze200-kb5noeto-ts0601.json +++ b/tests/data/devices/tze200-kb5noeto-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:79:e4:8f:e2", "nwk": "0x5DEA", "manufacturer": "_TZE200_kb5noeto", @@ -223,22 +223,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -266,22 +250,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -311,22 +279,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -359,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -406,22 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -453,22 +373,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -500,22 +404,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -549,22 +437,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -599,22 +471,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -643,22 +499,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -687,22 +527,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -739,22 +563,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -783,22 +591,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, @@ -829,22 +621,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:79:e4:8f:e2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:79:e4:8f:e2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-khozatfx-ts0601.json b/tests/data/devices/tze200-khozatfx-ts0601.json index c6397dfb5..f9a700723 100644 --- a/tests/data/devices/tze200-khozatfx-ts0601.json +++ b/tests/data/devices/tze200-khozatfx-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b3:a4:6c:2b", "nwk": "0xFE9C", "manufacturer": "_TZE200_khozatfx", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b3:a4:6c:2b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b3:a4:6c:2b", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b3:a4:6c:2b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b3:a4:6c:2b", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b3:a4:6c:2b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b3:a4:6c:2b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-kyfqmmyl-ts0601.json b/tests/data/devices/tze200-kyfqmmyl-ts0601.json index 3830853f0..ff3b37b5c 100644 --- a/tests/data/devices/tze200-kyfqmmyl-ts0601.json +++ b/tests/data/devices/tze200-kyfqmmyl-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b4:bb:95:b1", "nwk": "0xA05D", "manufacturer": "_TZE200_kyfqmmyl", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:b4:bb:95:b1:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b4:bb:95:b1", "endpoint_id": 1, "available": true, @@ -287,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:b4:bb:95:b1:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b4:bb:95:b1", "endpoint_id": 2, "available": true, @@ -353,22 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:b4:bb:95:b1:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:b4:bb:95:b1", "endpoint_id": 3, "available": true, @@ -421,22 +373,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b4:bb:95:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b4:bb:95:b1", "endpoint_id": 1, "available": true, @@ -465,22 +401,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b4:bb:95:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b4:bb:95:b1", "endpoint_id": 1, "available": true, @@ -511,22 +431,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b4:bb:95:b1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b4:bb:95:b1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-la2c2uo9-ts0601.json b/tests/data/devices/tze200-la2c2uo9-ts0601.json index ca975ab6d..e2e17c879 100644 --- a/tests/data/devices/tze200-la2c2uo9-ts0601.json +++ b/tests/data/devices/tze200-la2c2uo9-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:84:73:2a:0e", "nwk": "0xA997", "manufacturer": "_TZE200_la2c2uo9", @@ -167,36 +167,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:84:73:2a:0e:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:84:73:2a:0e:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:84:73:2a:0e", "endpoint_id": 1, "available": true, @@ -250,22 +220,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:84:73:2a:0e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:84:73:2a:0e", "endpoint_id": 1, "available": true, @@ -294,22 +248,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:84:73:2a:0e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:84:73:2a:0e", "endpoint_id": 1, "available": true, @@ -340,22 +278,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:84:73:2a:0e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:84:73:2a:0e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-laqjm8qd-ts0601.json b/tests/data/devices/tze200-laqjm8qd-ts0601.json index 31e702e4c..2b0d686cb 100644 --- a/tests/data/devices/tze200-laqjm8qd-ts0601.json +++ b/tests/data/devices/tze200-laqjm8qd-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:47:7b:70:ef", "nwk": "0xD96E", "manufacturer": "_TZE200_laqjm8qd", @@ -170,22 +170,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:47:7b:70:ef:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:7b:70:ef", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:47:7b:70:ef:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:7b:70:ef", "endpoint_id": 1, "available": true, @@ -260,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:47:7b:70:ef:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:7b:70:ef", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-libht6ua-ts0601.json b/tests/data/devices/tze200-libht6ua-ts0601.json index cfeb987ea..01410ebd9 100644 --- a/tests/data/devices/tze200-libht6ua-ts0601.json +++ b/tests/data/devices/tze200-libht6ua-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:25:a7:64:05", "nwk": "0x1C07", "manufacturer": "_TZE200_libht6ua", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:25:a7:64:05:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:a7:64:05", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:25:a7:64:05:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:a7:64:05", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:25:a7:64:05:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:25:a7:64:05", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-locansqn-ts0601.json b/tests/data/devices/tze200-locansqn-ts0601.json index 7bfd690d8..c179cd1e4 100644 --- a/tests/data/devices/tze200-locansqn-ts0601.json +++ b/tests/data/devices/tze200-locansqn-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5b:b2:b6:59", "nwk": "0x3C2E", "manufacturer": "_TZE200_locansqn", @@ -303,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -350,22 +334,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -397,22 +365,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -444,22 +396,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -491,22 +427,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -538,22 +458,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -585,22 +489,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -632,22 +520,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -681,22 +553,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -730,22 +586,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -774,22 +614,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -818,22 +642,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -869,22 +677,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -913,22 +705,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -957,22 +733,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -1001,22 +761,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, @@ -1047,22 +791,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5b:b2:b6:59:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5b:b2:b6:59", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-m9skfctm-ts0601.json b/tests/data/devices/tze200-m9skfctm-ts0601.json index 3a5781834..0a52b7497 100644 --- a/tests/data/devices/tze200-m9skfctm-ts0601.json +++ b/tests/data/devices/tze200-m9skfctm-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ef:2f:91:36", "nwk": "0x2544", "manufacturer": "_TZE200_m9skfctm", @@ -166,22 +166,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:ef:2f:91:36:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:2f:91:36", "endpoint_id": 1, "available": true, @@ -211,22 +195,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ef:2f:91:36:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:2f:91:36", "endpoint_id": 1, "available": true, @@ -255,22 +223,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ef:2f:91:36:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:2f:91:36", "endpoint_id": 1, "available": true, @@ -301,22 +253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ef:2f:91:36:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ef:2f:91:36", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-mgxy2d9f-ts0601.json b/tests/data/devices/tze200-mgxy2d9f-ts0601.json index b9370f163..6a29ab385 100644 --- a/tests/data/devices/tze200-mgxy2d9f-ts0601.json +++ b/tests/data/devices/tze200-mgxy2d9f-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:9c:35:bf:88", "nwk": "0x4520", "manufacturer": "_TZE200_mgxy2d9f", @@ -148,22 +148,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9c:35:bf:88:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9c:35:bf:88", "endpoint_id": 1, "available": true, @@ -192,22 +176,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9c:35:bf:88:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9c:35:bf:88", "endpoint_id": 1, "available": true, @@ -238,22 +206,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:9c:35:bf:88:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9c:35:bf:88", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-mja3fuja-ts0601.json b/tests/data/devices/tze200-mja3fuja-ts0601.json index 151005a0f..635583552 100644 --- a/tests/data/devices/tze200-mja3fuja-ts0601.json +++ b/tests/data/devices/tze200-mja3fuja-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:59:63:f5:06", "nwk": "0x7803", "manufacturer": "_TZE200_mja3fuja", @@ -200,22 +200,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:59:63:f5:06:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:59:63:f5:06", "endpoint_id": 1, "available": true, @@ -244,22 +228,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:59:63:f5:06:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:59:63:f5:06", "endpoint_id": 1, "available": true, @@ -288,22 +256,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:59:63:f5:06:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:59:63:f5:06", "endpoint_id": 1, "available": true, @@ -332,22 +284,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:59:63:f5:06:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:59:63:f5:06", "endpoint_id": 1, "available": true, @@ -376,22 +312,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "CarbonDioxideConcentrationClusterHandler", - "generic_id": "cluster_handler_0x040d", - "endpoint_id": 1, - "cluster": { - "id": 1037, - "name": "Carbon Dioxide (CO\u2082) Concentration", - "type": "server" - }, - "id": "1:0x040d", - "unique_id": "ab:cd:ef:12:59:63:f5:06:1:0x040d", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:59:63:f5:06", "endpoint_id": 1, "available": true, @@ -420,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "FormaldehydeConcentrationClusterHandler", - "generic_id": "cluster_handler_0x042b", - "endpoint_id": 1, - "cluster": { - "id": 1067, - "name": "Formaldehyde Concentration", - "type": "server" - }, - "id": "1:0x042b", - "unique_id": "ab:cd:ef:12:59:63:f5:06:1:0x042b", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:59:63:f5:06", "endpoint_id": 1, "available": true, @@ -464,22 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0x042e", - "endpoint_id": 1, - "cluster": { - "id": 1070, - "name": "VOC Level", - "type": "server" - }, - "id": "1:0x042e", - "unique_id": "ab:cd:ef:12:59:63:f5:06:1:0x042e", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:59:63:f5:06", "endpoint_id": 1, "available": true, @@ -510,22 +398,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:59:63:f5:06:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:59:63:f5:06", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-moycceze-ts0601.json b/tests/data/devices/tze200-moycceze-ts0601.json index 541ccbb28..141fc8457 100644 --- a/tests/data/devices/tze200-moycceze-ts0601.json +++ b/tests/data/devices/tze200-moycceze-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d8:e7:36:48", "nwk": "0x633C", "manufacturer": "_TZE200_moycceze", @@ -148,22 +148,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d8:e7:36:48:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d8:e7:36:48", "endpoint_id": 1, "available": true, @@ -192,22 +176,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d8:e7:36:48:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d8:e7:36:48", "endpoint_id": 1, "available": true, @@ -238,22 +206,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d8:e7:36:48:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d8:e7:36:48", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-mudxchsu-ts0601.json b/tests/data/devices/tze200-mudxchsu-ts0601.json index 0d30863be..79e72f2e7 100644 --- a/tests/data/devices/tze200-mudxchsu-ts0601.json +++ b/tests/data/devices/tze200-mudxchsu-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:65:80:74:f3", "nwk": "0xD56F", "manufacturer": "_TZE200_mudxchsu", @@ -655,22 +655,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -700,22 +684,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -784,22 +752,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 1, - "cluster": { - "id": 13, - "name": "ZONNSMARTTemperatureOffset", - "type": "server" - }, - "id": "1:0x000d", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -831,22 +783,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -878,22 +814,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -925,22 +845,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -972,22 +876,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 2, - "cluster": { - "id": 13, - "name": "ZONNSMARTWindowOpenedTemp", - "type": "server" - }, - "id": "2:0x000d", - "unique_id": "ab:cd:ef:12:65:80:74:f3:2:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 2, "available": true, @@ -1021,22 +909,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -1073,22 +945,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -1117,22 +973,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -1161,22 +1001,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -1212,22 +1036,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -1256,22 +1064,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -1302,22 +1094,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, @@ -1344,22 +1120,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:65:80:74:f3:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 2, "available": true, @@ -1386,22 +1146,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:65:80:74:f3:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 3, "available": true, @@ -1430,22 +1174,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:65:80:74:f3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:80:74:f3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-myd45weu-ts0601.json b/tests/data/devices/tze200-myd45weu-ts0601.json index f63c9230d..c5e733cac 100644 --- a/tests/data/devices/tze200-myd45weu-ts0601.json +++ b/tests/data/devices/tze200-myd45weu-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:eb:f7:3f:43:1c", "nwk": "0xB0C5", "manufacturer": "_TZE200_myd45weu", @@ -218,22 +218,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:eb:f7:3f:43:1c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:eb:f7:3f:43:1c", "endpoint_id": 1, "available": true, @@ -262,22 +246,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:eb:f7:3f:43:1c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:eb:f7:3f:43:1c", "endpoint_id": 1, "available": true, @@ -306,22 +274,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "a4:c1:38:eb:f7:3f:43:1c:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "a4:c1:38:eb:f7:3f:43:1c", "endpoint_id": 1, "available": true, @@ -357,22 +309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "a4:c1:38:eb:f7:3f:43:1c:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:eb:f7:3f:43:1c", "endpoint_id": 1, "available": true, @@ -401,22 +337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SoilMoistureClusterHandler", - "generic_id": "cluster_handler_0x0408", - "endpoint_id": 1, - "cluster": { - "id": 1032, - "name": "Soil Moisture Measurement", - "type": "server" - }, - "id": "1:0x0408", - "unique_id": "a4:c1:38:eb:f7:3f:43:1c:1:0x0408", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:eb:f7:3f:43:1c", "endpoint_id": 1, "available": true, @@ -447,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "a4:c1:38:eb:f7:3f:43:1c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:eb:f7:3f:43:1c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-mz5y07w2-ts0601.json b/tests/data/devices/tze200-mz5y07w2-ts0601.json index e79d4911f..26742f1f5 100644 --- a/tests/data/devices/tze200-mz5y07w2-ts0601.json +++ b/tests/data/devices/tze200-mz5y07w2-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7c:a1:1a:65", "nwk": "0x84F0", "manufacturer": "_TZE200_mz5y07w2", @@ -252,22 +252,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, @@ -331,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 1, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "1:0x000d", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, @@ -378,22 +346,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, @@ -425,22 +377,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, @@ -474,22 +410,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, @@ -518,22 +438,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, @@ -562,22 +466,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, @@ -611,22 +499,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, @@ -655,22 +527,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, @@ -699,22 +555,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, @@ -743,22 +583,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, @@ -789,22 +613,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:7c:a1:1a:65:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7c:a1:1a:65", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-mzik0ov2-ts0601.json b/tests/data/devices/tze200-mzik0ov2-ts0601.json index b5735df1c..423b70f4a 100644 --- a/tests/data/devices/tze200-mzik0ov2-ts0601.json +++ b/tests/data/devices/tze200-mzik0ov2-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cb:9b:c1:59", "nwk": "0x4102", "manufacturer": "_TZE200_mzik0ov2", @@ -148,22 +148,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cb:9b:c1:59:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:9b:c1:59", "endpoint_id": 1, "available": true, @@ -192,22 +176,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cb:9b:c1:59:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:9b:c1:59", "endpoint_id": 1, "available": true, @@ -238,22 +206,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cb:9b:c1:59:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:9b:c1:59", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-nklqjk62-ts0601.json b/tests/data/devices/tze200-nklqjk62-ts0601.json index 2f829149f..3ddf12f6c 100644 --- a/tests/data/devices/tze200-nklqjk62-ts0601.json +++ b/tests/data/devices/tze200-nklqjk62-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:34:58:0b:f7", "nwk": "0xAC7D", "manufacturer": "_TZE200_nklqjk62", @@ -158,22 +158,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:34:58:0b:f7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:58:0b:f7", "endpoint_id": 1, "available": true, @@ -202,22 +186,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:34:58:0b:f7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:58:0b:f7", "endpoint_id": 1, "available": true, @@ -248,22 +216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:34:58:0b:f7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:58:0b:f7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-nojsjtj2-ts0601.json b/tests/data/devices/tze200-nojsjtj2-ts0601.json index 6ad66b130..2c26bbde1 100644 --- a/tests/data/devices/tze200-nojsjtj2-ts0601.json +++ b/tests/data/devices/tze200-nojsjtj2-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f4:9a:26:de", "nwk": "0xC1B4", "manufacturer": "_TZE200_nojsjtj2", @@ -168,22 +168,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:f4:9a:26:de:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:9a:26:de", "endpoint_id": 1, "available": true, @@ -213,22 +197,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:f4:9a:26:de:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:9a:26:de", "endpoint_id": 1, "available": true, @@ -261,22 +229,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f4:9a:26:de:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:9a:26:de", "endpoint_id": 1, "available": true, @@ -305,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f4:9a:26:de:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:9a:26:de", "endpoint_id": 1, "available": true, @@ -349,22 +285,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:f4:9a:26:de:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:f4:9a:26:de", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-npj9bug3-ts0601.json b/tests/data/devices/tze200-npj9bug3-ts0601.json index 68ab83fe8..8495d8cbb 100644 --- a/tests/data/devices/tze200-npj9bug3-ts0601.json +++ b/tests/data/devices/tze200-npj9bug3-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e1:11:1c:cf", "nwk": "0xE47C", "manufacturer": "_TZE200_npj9bug3", @@ -180,22 +180,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e1:11:1c:cf:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:11:1c:cf", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e1:11:1c:cf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:11:1c:cf", "endpoint_id": 1, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e1:11:1c:cf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:11:1c:cf", "endpoint_id": 1, "available": true, @@ -316,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:e1:11:1c:cf:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:e1:11:1c:cf", "endpoint_id": 1, "available": true, @@ -366,22 +302,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:e1:11:1c:cf:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e1:11:1c:cf", "endpoint_id": 1, "available": true, @@ -410,22 +330,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:e1:11:1c:cf:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e1:11:1c:cf", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-nqaqq4cf-ts0601.json b/tests/data/devices/tze200-nqaqq4cf-ts0601.json index 24c7cb0fb..be82150d2 100644 --- a/tests/data/devices/tze200-nqaqq4cf-ts0601.json +++ b/tests/data/devices/tze200-nqaqq4cf-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a2:f2:ce:d0", "nwk": "0xCF44", "manufacturer": "_TZE200_nqaqq4cf", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:f2:ce:d0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:f2:ce:d0", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:f2:ce:d0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:f2:ce:d0", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a2:f2:ce:d0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:f2:ce:d0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-ntcy3xu1-ts0601.json b/tests/data/devices/tze200-ntcy3xu1-ts0601.json index 147864fd5..d9627b1bd 100644 --- a/tests/data/devices/tze200-ntcy3xu1-ts0601.json +++ b/tests/data/devices/tze200-ntcy3xu1-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:3c:49:18:ca", "nwk": "0x30D5", "manufacturer": "_TZE200_ntcy3xu1", @@ -198,22 +198,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:3c:49:18:ca:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3c:49:18:ca", "endpoint_id": 1, "available": true, @@ -241,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:3c:49:18:ca:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3c:49:18:ca", "endpoint_id": 1, "available": true, @@ -286,22 +254,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3c:49:18:ca:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3c:49:18:ca", "endpoint_id": 1, "available": true, @@ -330,22 +282,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3c:49:18:ca:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3c:49:18:ca", "endpoint_id": 1, "available": true, @@ -374,22 +310,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:3c:49:18:ca:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:3c:49:18:ca", "endpoint_id": 1, "available": true, @@ -427,22 +347,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:3c:49:18:ca:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3c:49:18:ca", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-ny94onlb-ts0601.json b/tests/data/devices/tze200-ny94onlb-ts0601.json index 12dbd735a..62396994a 100644 --- a/tests/data/devices/tze200-ny94onlb-ts0601.json +++ b/tests/data/devices/tze200-ny94onlb-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:58:8c:89:ff", "nwk": "0x7885", "manufacturer": "_TZE200_ny94onlb", @@ -876,22 +876,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -920,22 +904,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -964,22 +932,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -1005,7 +957,7 @@ "unique_id": "ab:cd:ef:12:58:8c:89:ff-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1014,22 +966,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -1038,7 +974,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 298.0 }, @@ -1062,22 +998,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -1110,22 +1030,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -1158,22 +1062,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -1206,22 +1094,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -1254,22 +1126,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -1302,22 +1158,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -1350,22 +1190,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -1398,22 +1222,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, @@ -1437,7 +1245,7 @@ "unique_id": "ab:cd:ef:12:58:8c:89:ff-10-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1446,22 +1254,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 10, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "10:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:10:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 10, "available": true, @@ -1470,7 +1262,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 298.0 }, @@ -1494,22 +1286,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 10, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "10:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:10:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 10, "available": true, @@ -1542,22 +1318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 10, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "10:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:10:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 10, "available": true, @@ -1581,7 +1341,7 @@ "unique_id": "ab:cd:ef:12:58:8c:89:ff-20-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1590,22 +1350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 20, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "20:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:20:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 20, "available": true, @@ -1614,7 +1358,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 266.0 }, @@ -1638,22 +1382,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 20, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "20:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:20:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 20, "available": true, @@ -1686,22 +1414,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 20, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "20:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:20:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 20, "available": true, @@ -1725,7 +1437,7 @@ "unique_id": "ab:cd:ef:12:58:8c:89:ff-30-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1734,22 +1446,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 30, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "30:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:30:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 30, "available": true, @@ -1758,7 +1454,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 70.0 }, @@ -1782,22 +1478,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 30, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "30:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:30:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 30, "available": true, @@ -1830,22 +1510,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 30, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "30:0x0b04", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:30:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 30, "available": true, @@ -1880,22 +1544,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:58:8c:89:ff:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:58:8c:89:ff", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-nyvavzbj-ts0601.json b/tests/data/devices/tze200-nyvavzbj-ts0601.json index a62eda5e7..da0ada21d 100644 --- a/tests/data/devices/tze200-nyvavzbj-ts0601.json +++ b/tests/data/devices/tze200-nyvavzbj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:fa:83:cd:d7", "nwk": "0x0F97", "manufacturer": "_TZE200_nyvavzbj", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fa:83:cd:d7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:83:cd:d7", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fa:83:cd:d7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:83:cd:d7", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:fa:83:cd:d7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:83:cd:d7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-pay2byax-ts0601.json b/tests/data/devices/tze200-pay2byax-ts0601.json index d76bbbc29..4f170e5c6 100644 --- a/tests/data/devices/tze200-pay2byax-ts0601.json +++ b/tests/data/devices/tze200-pay2byax-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e7:bc:ea:ac", "nwk": "0xADC3", "manufacturer": "_TZE200_pay2byax", @@ -196,22 +196,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:e7:bc:ea:ac:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:bc:ea:ac", "endpoint_id": 1, "available": true, @@ -241,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e7:bc:ea:ac:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:bc:ea:ac", "endpoint_id": 1, "available": true, @@ -289,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:bc:ea:ac:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:bc:ea:ac", "endpoint_id": 1, "available": true, @@ -333,22 +285,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:bc:ea:ac:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:bc:ea:ac", "endpoint_id": 1, "available": true, @@ -377,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:e7:bc:ea:ac:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:e7:bc:ea:ac", "endpoint_id": 1, "available": true, @@ -429,22 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:e7:bc:ea:ac:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e7:bc:ea:ac", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-pl31aqf5-ts0601.json b/tests/data/devices/tze200-pl31aqf5-ts0601.json index 91e718dcc..4a447acd3 100644 --- a/tests/data/devices/tze200-pl31aqf5-ts0601.json +++ b/tests/data/devices/tze200-pl31aqf5-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cb:8d:08:24", "nwk": "0xC3D9", "manufacturer": "_TZE200_pl31aqf5", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cb:8d:08:24:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:8d:08:24", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cb:8d:08:24:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:8d:08:24", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cb:8d:08:24:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cb:8d:08:24", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-pw7mji0l-ts0601.json b/tests/data/devices/tze200-pw7mji0l-ts0601.json index 8c88ee24c..4a73eba7f 100644 --- a/tests/data/devices/tze200-pw7mji0l-ts0601.json +++ b/tests/data/devices/tze200-pw7mji0l-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1b:2f:89:a8", "nwk": "0x431F", "manufacturer": "_TZE200_pw7mji0l", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:1b:2f:89:a8:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:1b:2f:89:a8", "endpoint_id": 1, "available": true, @@ -210,22 +194,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1b:2f:89:a8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:2f:89:a8", "endpoint_id": 1, "available": true, @@ -254,22 +222,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1b:2f:89:a8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:2f:89:a8", "endpoint_id": 1, "available": true, @@ -298,22 +250,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:1b:2f:89:a8:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:1b:2f:89:a8", "endpoint_id": 1, "available": true, @@ -344,22 +280,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1b:2f:89:a8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:2f:89:a8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-qhlxve78-ts0601.json b/tests/data/devices/tze200-qhlxve78-ts0601.json index 8c9bbf6eb..4fbed0748 100644 --- a/tests/data/devices/tze200-qhlxve78-ts0601.json +++ b/tests/data/devices/tze200-qhlxve78-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d5:5a:28:81", "nwk": "0x50BD", "manufacturer": "_TZE200_qhlxve78", @@ -209,22 +209,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d5:5a:28:81:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:5a:28:81", "endpoint_id": 1, "available": true, @@ -253,22 +237,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d5:5a:28:81:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:5a:28:81", "endpoint_id": 1, "available": true, @@ -299,22 +267,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d5:5a:28:81:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:5a:28:81", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-qrztc3ev-ts0601.json b/tests/data/devices/tze200-qrztc3ev-ts0601.json index 3a6617435..9028cb0cb 100644 --- a/tests/data/devices/tze200-qrztc3ev-ts0601.json +++ b/tests/data/devices/tze200-qrztc3ev-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a9:de:c2:da", "nwk": "0xBE33", "manufacturer": "_TZE200_qrztc3ev", @@ -178,22 +178,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -225,22 +209,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -319,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -366,22 +302,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -413,22 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -460,22 +364,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -507,22 +395,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -556,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -605,22 +461,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -649,22 +489,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -693,22 +517,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -744,22 +552,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -788,22 +580,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -832,22 +608,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -876,22 +636,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, @@ -922,22 +666,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a9:de:c2:da:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:de:c2:da", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-qyflbnbj-ts0601.json b/tests/data/devices/tze200-qyflbnbj-ts0601.json index f1154afe4..8ba3be3a0 100644 --- a/tests/data/devices/tze200-qyflbnbj-ts0601.json +++ b/tests/data/devices/tze200-qyflbnbj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5d:8a:7c:64", "nwk": "0x9AA2", "manufacturer": "_TZE200_qyflbnbj", @@ -237,22 +237,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5d:8a:7c:64:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5d:8a:7c:64", "endpoint_id": 1, "available": true, @@ -281,22 +265,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5d:8a:7c:64:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5d:8a:7c:64", "endpoint_id": 1, "available": true, @@ -325,22 +293,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:5d:8a:7c:64:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:5d:8a:7c:64", "endpoint_id": 1, "available": true, @@ -376,22 +328,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:5d:8a:7c:64:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:5d:8a:7c:64", "endpoint_id": 1, "available": true, @@ -420,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:5d:8a:7c:64:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:5d:8a:7c:64", "endpoint_id": 1, "available": true, @@ -466,22 +386,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5d:8a:7c:64:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5d:8a:7c:64", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-r32ctezx-ts0601.json b/tests/data/devices/tze200-r32ctezx-ts0601.json index 1bfae91e0..b8a3c6d86 100644 --- a/tests/data/devices/tze200-r32ctezx-ts0601.json +++ b/tests/data/devices/tze200-r32ctezx-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:38:4a:57:6b", "nwk": "0x4CCB", "manufacturer": "_TZE200_r32ctezx", @@ -197,36 +197,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:38:4a:57:6b:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:38:4a:57:6b:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:38:4a:57:6b", "endpoint_id": 1, "available": true, @@ -280,22 +250,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:38:4a:57:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:4a:57:6b", "endpoint_id": 1, "available": true, @@ -324,22 +278,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:38:4a:57:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:4a:57:6b", "endpoint_id": 1, "available": true, @@ -370,22 +308,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:38:4a:57:6b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:4a:57:6b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-r5ksy7qo-ts0601.json b/tests/data/devices/tze200-r5ksy7qo-ts0601.json index 8ae10ea78..ae82db1e7 100644 --- a/tests/data/devices/tze200-r5ksy7qo-ts0601.json +++ b/tests/data/devices/tze200-r5ksy7qo-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:67:e1:be:80", "nwk": "0x2E17", "manufacturer": "_TZE200_r5ksy7qo", @@ -135,22 +135,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:67:e1:be:80:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:67:e1:be:80", "endpoint_id": 1, "available": true, @@ -179,22 +163,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:67:e1:be:80:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:67:e1:be:80", "endpoint_id": 1, "available": true, @@ -225,22 +193,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:67:e1:be:80:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:67:e1:be:80", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-rccxox8p-ts0601.json b/tests/data/devices/tze200-rccxox8p-ts0601.json index 9330fe766..90fa36d57 100644 --- a/tests/data/devices/tze200-rccxox8p-ts0601.json +++ b/tests/data/devices/tze200-rccxox8p-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f8:f4:e6:c9", "nwk": "0xE38C", "manufacturer": "_TZE200_rccxox8p", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:f8:f4:e6:c9:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f8:f4:e6:c9", "endpoint_id": 1, "available": true, @@ -199,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f8:f4:e6:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f8:f4:e6:c9", "endpoint_id": 1, "available": true, @@ -243,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f8:f4:e6:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f8:f4:e6:c9", "endpoint_id": 1, "available": true, @@ -289,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f8:f4:e6:c9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f8:f4:e6:c9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-rk1wojce-ts0601.json b/tests/data/devices/tze200-rk1wojce-ts0601.json index 2771fe2bf..7b099d5c7 100644 --- a/tests/data/devices/tze200-rk1wojce-ts0601.json +++ b/tests/data/devices/tze200-rk1wojce-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e2:32:83:5b", "nwk": "0x13CE", "manufacturer": "_TZE200_rk1wojce", @@ -148,22 +148,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e2:32:83:5b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e2:32:83:5b", "endpoint_id": 1, "available": true, @@ -192,22 +176,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e2:32:83:5b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e2:32:83:5b", "endpoint_id": 1, "available": true, @@ -238,22 +206,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e2:32:83:5b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e2:32:83:5b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-rks0sgb7-ts0601.json b/tests/data/devices/tze200-rks0sgb7-ts0601.json index 363d298fd..82c21d5d6 100644 --- a/tests/data/devices/tze200-rks0sgb7-ts0601.json +++ b/tests/data/devices/tze200-rks0sgb7-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a9:ec:b3:fc", "nwk": "0x3DD4", "manufacturer": "_TZE200_rks0sgb7", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a9:ec:b3:fc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:ec:b3:fc", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a9:ec:b3:fc:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:ec:b3:fc", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a9:ec:b3:fc:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a9:ec:b3:fc", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-rmymn92d-ts0601.json b/tests/data/devices/tze200-rmymn92d-ts0601.json index 11f9e1346..0058a0f2b 100644 --- a/tests/data/devices/tze200-rmymn92d-ts0601.json +++ b/tests/data/devices/tze200-rmymn92d-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1a:44:3f:67", "nwk": "0xE20B", "manufacturer": "_TZE200_rmymn92d", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1a:44:3f:67:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:44:3f:67", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1a:44:3f:67:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:44:3f:67", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1a:44:3f:67:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1a:44:3f:67", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-rtrmfadk-ts0601.json b/tests/data/devices/tze200-rtrmfadk-ts0601.json index 4544004bd..5c1d13eb3 100644 --- a/tests/data/devices/tze200-rtrmfadk-ts0601.json +++ b/tests/data/devices/tze200-rtrmfadk-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:28:28:8c:ab", "nwk": "0xEAFF", "manufacturer": "_TZE200_rtrmfadk", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:28:28:8c:ab:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:28:8c:ab", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:28:28:8c:ab:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:28:8c:ab", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:28:28:8c:ab:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:28:28:8c:ab", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-rxq4iti9-ts0601.json b/tests/data/devices/tze200-rxq4iti9-ts0601.json index 17af1d5e6..a9a468779 100644 --- a/tests/data/devices/tze200-rxq4iti9-ts0601.json +++ b/tests/data/devices/tze200-rxq4iti9-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:44:6e:72:22", "nwk": "0x9CB4", "manufacturer": "_TZE200_rxq4iti9", @@ -359,22 +359,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, @@ -404,22 +388,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, @@ -483,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 1, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "1:0x000d", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, @@ -530,22 +482,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, @@ -579,22 +515,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, @@ -623,22 +543,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, @@ -667,22 +571,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, @@ -716,22 +604,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, @@ -762,22 +634,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, @@ -810,22 +666,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, @@ -858,22 +698,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, @@ -908,22 +732,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:44:6e:72:22:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:6e:72:22", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-s6hzw8g2-ts0601.json b/tests/data/devices/tze200-s6hzw8g2-ts0601.json index 2ad547ac3..20e34630d 100644 --- a/tests/data/devices/tze200-s6hzw8g2-ts0601.json +++ b/tests/data/devices/tze200-s6hzw8g2-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2e:e7:1e:19", "nwk": "0xDBA8", "manufacturer": "_TZE200_s6hzw8g2", @@ -141,22 +141,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2e:e7:1e:19:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2e:e7:1e:19", "endpoint_id": 1, "available": true, @@ -185,22 +169,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2e:e7:1e:19:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2e:e7:1e:19", "endpoint_id": 1, "available": true, @@ -231,22 +199,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:2e:e7:1e:19:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2e:e7:1e:19", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-sur6q7ko-ts0601.json b/tests/data/devices/tze200-sur6q7ko-ts0601.json index 097a69e3f..3e5009428 100644 --- a/tests/data/devices/tze200-sur6q7ko-ts0601.json +++ b/tests/data/devices/tze200-sur6q7ko-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a2:68:cb:79", "nwk": "0x2B0E", "manufacturer": "_TZE200_sur6q7ko", @@ -547,22 +547,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 1, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "1:0x000f", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -592,22 +576,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -671,22 +639,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 1, - "cluster": { - "id": 13, - "name": "ZONNSMARTTemperatureOffset", - "type": "server" - }, - "id": "1:0x000d", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -718,22 +670,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -765,22 +701,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -812,22 +732,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -859,22 +763,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 2, - "cluster": { - "id": 13, - "name": "ZONNSMARTWindowOpenedTemp", - "type": "server" - }, - "id": "2:0x000d", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:2:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 2, "available": true, @@ -908,22 +796,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -960,22 +832,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -1004,22 +860,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -1048,22 +888,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -1099,22 +923,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -1143,22 +951,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -1187,22 +979,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -1231,22 +1007,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "ZONNSMARTThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -1277,22 +1037,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, @@ -1319,22 +1063,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 2, "available": true, @@ -1361,22 +1089,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 3, "available": true, @@ -1405,22 +1117,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a2:68:cb:79:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:68:cb:79", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-t1blo2bj-ts0601.json b/tests/data/devices/tze200-t1blo2bj-ts0601.json index f2557a31f..eda038536 100644 --- a/tests/data/devices/tze200-t1blo2bj-ts0601.json +++ b/tests/data/devices/tze200-t1blo2bj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7b:12:28:a9", "nwk": "0x42B7", "manufacturer": "_TZE200_t1blo2bj", @@ -189,22 +189,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:7b:12:28:a9:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:12:28:a9", "endpoint_id": 1, "available": true, @@ -238,22 +222,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:7b:12:28:a9:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:12:28:a9", "endpoint_id": 1, "available": true, @@ -301,22 +269,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:7b:12:28:a9:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:12:28:a9", "endpoint_id": 1, "available": true, @@ -351,22 +303,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:12:28:a9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:12:28:a9", "endpoint_id": 1, "available": true, @@ -395,22 +331,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:12:28:a9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:12:28:a9", "endpoint_id": 1, "available": true, @@ -441,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:7b:12:28:a9:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:7b:12:28:a9", "endpoint_id": 1, "available": true, @@ -483,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:7b:12:28:a9:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:12:28:a9", "endpoint_id": 1, "available": true, @@ -533,22 +421,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:7b:12:28:a9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:12:28:a9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-t6gq6nju-ts0601.json b/tests/data/devices/tze200-t6gq6nju-ts0601.json index bd8ff11ae..580aff80d 100644 --- a/tests/data/devices/tze200-t6gq6nju-ts0601.json +++ b/tests/data/devices/tze200-t6gq6nju-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e3:0b:62:5b", "nwk": "0x9BBE", "manufacturer": "_TZE200_t6gq6nju", @@ -230,22 +230,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e3:0b:62:5b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:0b:62:5b", "endpoint_id": 1, "available": true, @@ -274,22 +258,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e3:0b:62:5b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:0b:62:5b", "endpoint_id": 1, "available": true, @@ -320,22 +288,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e3:0b:62:5b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:0b:62:5b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-udank5zs-ts0601.json b/tests/data/devices/tze200-udank5zs-ts0601.json index 6891729ab..20a81c606 100644 --- a/tests/data/devices/tze200-udank5zs-ts0601.json +++ b/tests/data/devices/tze200-udank5zs-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e7:7f:df:74", "nwk": "0xC63F", "manufacturer": "_TZE200_udank5zs", @@ -148,22 +148,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:7f:df:74:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7f:df:74", "endpoint_id": 1, "available": true, @@ -192,22 +176,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:7f:df:74:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7f:df:74", "endpoint_id": 1, "available": true, @@ -238,22 +206,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e7:7f:df:74:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7f:df:74", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-uf1qujxj-ts0601.json b/tests/data/devices/tze200-uf1qujxj-ts0601.json index 7e4ad0b8b..756569992 100644 --- a/tests/data/devices/tze200-uf1qujxj-ts0601.json +++ b/tests/data/devices/tze200-uf1qujxj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1c:ee:a6:97", "nwk": "0x6A32", "manufacturer": "_TZE200_uf1qujxj", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1c:ee:a6:97:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1c:ee:a6:97", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1c:ee:a6:97:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1c:ee:a6:97", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1c:ee:a6:97:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1c:ee:a6:97", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-v1jqz5cy-ts0601.json b/tests/data/devices/tze200-v1jqz5cy-ts0601.json index 014c1fd25..4a54fd09f 100644 --- a/tests/data/devices/tze200-v1jqz5cy-ts0601.json +++ b/tests/data/devices/tze200-v1jqz5cy-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a4:97:18:07", "nwk": "0x1CF3", "manufacturer": "_TZE200_v1jqz5cy", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a4:97:18:07:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a4:97:18:07", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a4:97:18:07:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a4:97:18:07", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a4:97:18:07:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a4:97:18:07", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-v9hkz2yn-ts0601.json b/tests/data/devices/tze200-v9hkz2yn-ts0601.json index 8e89467b3..250c60507 100644 --- a/tests/data/devices/tze200-v9hkz2yn-ts0601.json +++ b/tests/data/devices/tze200-v9hkz2yn-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f7:c5:4c:1d", "nwk": "0x11C2", "manufacturer": "_TZE200_v9hkz2yn", @@ -378,22 +378,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -422,22 +406,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -466,22 +434,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -516,22 +468,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -566,22 +502,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -607,7 +527,7 @@ "unique_id": "ab:cd:ef:12:f7:c5:4c:1d-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -616,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -640,7 +544,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 35.0 }, @@ -664,22 +568,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -712,22 +600,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -760,22 +632,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -808,22 +664,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -856,22 +696,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -904,22 +728,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -952,22 +760,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -1000,22 +792,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, @@ -1050,22 +826,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f7:c5:4c:1d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f7:c5:4c:1d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-vdiuwbkq-ts0601.json b/tests/data/devices/tze200-vdiuwbkq-ts0601.json index c63110856..10a36d50d 100644 --- a/tests/data/devices/tze200-vdiuwbkq-ts0601.json +++ b/tests/data/devices/tze200-vdiuwbkq-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6c:37:b4:92", "nwk": "0x4479", "manufacturer": "_TZE200_vdiuwbkq", @@ -208,22 +208,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:6c:37:b4:92:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:6c:37:b4:92", "endpoint_id": 1, "available": true, @@ -258,22 +242,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6c:37:b4:92:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6c:37:b4:92", "endpoint_id": 1, "available": true, @@ -302,22 +270,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6c:37:b4:92:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6c:37:b4:92", "endpoint_id": 1, "available": true, @@ -348,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6c:37:b4:92:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6c:37:b4:92", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-viy9ihs7-ts0601.json b/tests/data/devices/tze200-viy9ihs7-ts0601.json index 2c1c8864f..be6c0e541 100644 --- a/tests/data/devices/tze200-viy9ihs7-ts0601.json +++ b/tests/data/devices/tze200-viy9ihs7-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:44:77:fc:02", "nwk": "0xECFF", "manufacturer": "_TZE200_viy9ihs7", @@ -184,22 +184,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -229,22 +213,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -308,22 +276,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -355,22 +307,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -404,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -453,22 +373,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -501,22 +405,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -549,22 +437,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -600,22 +472,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -644,22 +500,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -688,22 +528,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -734,22 +558,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -782,22 +590,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -830,22 +622,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, @@ -880,22 +656,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:44:77:fc:02:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:44:77:fc:02", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-vuqzj1ej-ts0601.json b/tests/data/devices/tze200-vuqzj1ej-ts0601.json index decc6ce72..a0da7d5f4 100644 --- a/tests/data/devices/tze200-vuqzj1ej-ts0601.json +++ b/tests/data/devices/tze200-vuqzj1ej-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:29:18:c5:bf", "nwk": "0x7135", "manufacturer": "_TZE200_vuqzj1ej", @@ -239,22 +239,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:29:18:c5:bf:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:29:18:c5:bf", "endpoint_id": 1, "available": true, @@ -284,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:29:18:c5:bf:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:29:18:c5:bf", "endpoint_id": 1, "available": true, @@ -332,22 +300,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:29:18:c5:bf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:29:18:c5:bf", "endpoint_id": 1, "available": true, @@ -376,22 +328,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:29:18:c5:bf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:29:18:c5:bf", "endpoint_id": 1, "available": true, @@ -420,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:29:18:c5:bf:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:29:18:c5:bf", "endpoint_id": 1, "available": true, @@ -470,22 +390,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:29:18:c5:bf:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:29:18:c5:bf", "endpoint_id": 1, "available": true, @@ -514,22 +418,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:29:18:c5:bf:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:29:18:c5:bf", "endpoint_id": 1, "available": true, @@ -558,22 +446,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:29:18:c5:bf:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:29:18:c5:bf", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-vvmbj46n-ts0601.json b/tests/data/devices/tze200-vvmbj46n-ts0601.json index 69b2636ab..122c541c5 100644 --- a/tests/data/devices/tze200-vvmbj46n-ts0601.json +++ b/tests/data/devices/tze200-vvmbj46n-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:85:68:2c:96", "nwk": "0x68BF", "manufacturer": "_TZE200_vvmbj46n", @@ -197,22 +197,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -244,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -291,22 +259,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -338,22 +290,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -385,22 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -432,22 +352,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -479,22 +383,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -526,22 +414,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -575,22 +447,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -624,22 +480,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -668,22 +508,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -712,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -763,22 +571,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -807,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -851,22 +627,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -895,22 +655,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, @@ -941,22 +685,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:85:68:2c:96:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:68:2c:96", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-wdfurkoa-ts0601.json b/tests/data/devices/tze200-wdfurkoa-ts0601.json index d99a21180..81d3288a8 100644 --- a/tests/data/devices/tze200-wdfurkoa-ts0601.json +++ b/tests/data/devices/tze200-wdfurkoa-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ba:51:0f:39", "nwk": "0xCD99", "manufacturer": "_TZE200_wdfurkoa", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ba:51:0f:39:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:51:0f:39", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ba:51:0f:39:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:51:0f:39", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ba:51:0f:39:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:51:0f:39", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-wfxuhoea-ts0601.json b/tests/data/devices/tze200-wfxuhoea-ts0601.json index e8205e59e..50671bf68 100644 --- a/tests/data/devices/tze200-wfxuhoea-ts0601.json +++ b/tests/data/devices/tze200-wfxuhoea-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:51:42:d4:41", "nwk": "0x34E5", "manufacturer": "_TZE200_wfxuhoea", @@ -165,22 +165,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:51:42:d4:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:42:d4:41", "endpoint_id": 1, "available": true, @@ -209,22 +193,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:51:42:d4:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:42:d4:41", "endpoint_id": 1, "available": true, @@ -255,22 +223,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:51:42:d4:41:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:51:42:d4:41", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-wktrysab-ts0601.json b/tests/data/devices/tze200-wktrysab-ts0601.json index 30d65a0bf..a397fa3ae 100644 --- a/tests/data/devices/tze200-wktrysab-ts0601.json +++ b/tests/data/devices/tze200-wktrysab-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:69:86:20:44", "nwk": "0xA74E", "manufacturer": "_TZE200_wktrysab", @@ -441,22 +441,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:69:86:20:44:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:69:86:20:44", "endpoint_id": 1, "available": true, @@ -507,22 +491,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:69:86:20:44:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:69:86:20:44", "endpoint_id": 2, "available": true, @@ -573,22 +541,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:69:86:20:44:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:69:86:20:44", "endpoint_id": 3, "available": true, @@ -639,22 +591,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:69:86:20:44:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:69:86:20:44", "endpoint_id": 4, "available": true, @@ -705,22 +641,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 5, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "5:0x0006", - "unique_id": "ab:cd:ef:12:69:86:20:44:5:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:69:86:20:44", "endpoint_id": 5, "available": true, @@ -771,22 +691,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 6, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "6:0x0006", - "unique_id": "ab:cd:ef:12:69:86:20:44:6:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:69:86:20:44", "endpoint_id": 6, "available": true, @@ -837,22 +741,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 7, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "7:0x0006", - "unique_id": "ab:cd:ef:12:69:86:20:44:7:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:69:86:20:44", "endpoint_id": 7, "available": true, @@ -903,22 +791,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 8, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "8:0x0006", - "unique_id": "ab:cd:ef:12:69:86:20:44:8:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:69:86:20:44", "endpoint_id": 8, "available": true, @@ -971,22 +843,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:69:86:20:44:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:69:86:20:44", "endpoint_id": 1, "available": true, @@ -1015,22 +871,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:69:86:20:44:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:69:86:20:44", "endpoint_id": 1, "available": true, @@ -1061,22 +901,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:69:86:20:44:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:69:86:20:44", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-wqashyqo-ts0601.json b/tests/data/devices/tze200-wqashyqo-ts0601.json index 02dd78d68..39d162bd6 100644 --- a/tests/data/devices/tze200-wqashyqo-ts0601.json +++ b/tests/data/devices/tze200-wqashyqo-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b9:21:9e:2d", "nwk": "0x4436", "manufacturer": "_TZE200_wqashyqo", @@ -180,22 +180,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:b9:21:9e:2d:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b9:21:9e:2d", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b9:21:9e:2d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b9:21:9e:2d", "endpoint_id": 1, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b9:21:9e:2d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b9:21:9e:2d", "endpoint_id": 1, "available": true, @@ -316,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:b9:21:9e:2d:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:b9:21:9e:2d", "endpoint_id": 1, "available": true, @@ -366,22 +302,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:b9:21:9e:2d:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:b9:21:9e:2d", "endpoint_id": 1, "available": true, @@ -410,22 +330,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:b9:21:9e:2d:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:b9:21:9e:2d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-xu4a5rhj-ts0601.json b/tests/data/devices/tze200-xu4a5rhj-ts0601.json index 7006bd6cc..55b18913c 100644 --- a/tests/data/devices/tze200-xu4a5rhj-ts0601.json +++ b/tests/data/devices/tze200-xu4a5rhj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c1:14:90:9a", "nwk": "0x8323", "manufacturer": "_TZE200_xu4a5rhj", @@ -170,22 +170,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c1:14:90:9a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c1:14:90:9a", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c1:14:90:9a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c1:14:90:9a", "endpoint_id": 1, "available": true, @@ -260,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c1:14:90:9a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c1:14:90:9a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-ya4ft0w4-ts0601.json b/tests/data/devices/tze200-ya4ft0w4-ts0601.json index 3ca9a82e8..1da92e1c9 100644 --- a/tests/data/devices/tze200-ya4ft0w4-ts0601.json +++ b/tests/data/devices/tze200-ya4ft0w4-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:82:14:a9:c3", "nwk": "0x7E88", "manufacturer": "_TZE200_ya4ft0w4", @@ -202,22 +202,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:82:14:a9:c3:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:82:14:a9:c3", "endpoint_id": 1, "available": true, @@ -247,22 +231,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:82:14:a9:c3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:82:14:a9:c3", "endpoint_id": 1, "available": true, @@ -294,22 +262,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:82:14:a9:c3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:82:14:a9:c3", "endpoint_id": 1, "available": true, @@ -341,22 +293,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:82:14:a9:c3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:82:14:a9:c3", "endpoint_id": 1, "available": true, @@ -388,22 +324,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:82:14:a9:c3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:82:14:a9:c3", "endpoint_id": 1, "available": true, @@ -435,22 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:82:14:a9:c3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:82:14:a9:c3", "endpoint_id": 1, "available": true, @@ -484,22 +388,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:82:14:a9:c3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:82:14:a9:c3", "endpoint_id": 1, "available": true, @@ -528,22 +416,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:82:14:a9:c3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:82:14:a9:c3", "endpoint_id": 1, "available": true, @@ -572,22 +444,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:82:14:a9:c3:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:82:14:a9:c3", "endpoint_id": 1, "available": true, @@ -616,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:82:14:a9:c3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:82:14:a9:c3", "endpoint_id": 1, "available": true, @@ -662,22 +502,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:82:14:a9:c3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:82:14:a9:c3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-yia0p3tr-ts0601.json b/tests/data/devices/tze200-yia0p3tr-ts0601.json index 89c3422e1..43f7550be 100644 --- a/tests/data/devices/tze200-yia0p3tr-ts0601.json +++ b/tests/data/devices/tze200-yia0p3tr-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:54:b9:8f:58", "nwk": "0x1C6E", "manufacturer": "_TZE200_yia0p3tr", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:54:b9:8f:58:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:54:b9:8f:58", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:54:b9:8f:58:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:54:b9:8f:58", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:54:b9:8f:58:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:54:b9:8f:58", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-yjjdcqsq-ts0601.json b/tests/data/devices/tze200-yjjdcqsq-ts0601.json index 5325e32cf..b838c52cd 100644 --- a/tests/data/devices/tze200-yjjdcqsq-ts0601.json +++ b/tests/data/devices/tze200-yjjdcqsq-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:67:06:f3:52", "nwk": "0x32EB", "manufacturer": "_TZE200_yjjdcqsq", @@ -191,22 +191,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:67:06:f3:52:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:67:06:f3:52", "endpoint_id": 1, "available": true, @@ -240,22 +224,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:67:06:f3:52:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:67:06:f3:52", "endpoint_id": 1, "available": true, @@ -284,22 +252,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:67:06:f3:52:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:67:06:f3:52", "endpoint_id": 1, "available": true, @@ -328,22 +280,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:67:06:f3:52:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:67:06:f3:52", "endpoint_id": 1, "available": true, @@ -379,22 +315,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:67:06:f3:52:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:67:06:f3:52", "endpoint_id": 1, "available": true, @@ -423,22 +343,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:67:06:f3:52:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:67:06:f3:52", "endpoint_id": 1, "available": true, @@ -469,22 +373,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:67:06:f3:52:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:67:06:f3:52", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-yojqa8xn-ts0601.json b/tests/data/devices/tze200-yojqa8xn-ts0601.json index 4b11aca5a..a4a71f08b 100644 --- a/tests/data/devices/tze200-yojqa8xn-ts0601.json +++ b/tests/data/devices/tze200-yojqa8xn-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:22:ef:46:1f", "nwk": "0x9173", "manufacturer": "_TZE200_yojqa8xn", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:22:ef:46:1f:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:ef:46:1f", "endpoint_id": 1, "available": true, @@ -226,22 +210,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:22:ef:46:1f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:ef:46:1f", "endpoint_id": 1, "available": true, @@ -269,22 +237,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:22:ef:46:1f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:ef:46:1f", "endpoint_id": 1, "available": true, @@ -314,22 +266,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:22:ef:46:1f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:ef:46:1f", "endpoint_id": 1, "available": true, @@ -363,22 +299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:22:ef:46:1f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:ef:46:1f", "endpoint_id": 1, "available": true, @@ -415,22 +335,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:ef:46:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:ef:46:1f", "endpoint_id": 1, "available": true, @@ -459,22 +363,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:ef:46:1f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:ef:46:1f", "endpoint_id": 1, "available": true, @@ -503,22 +391,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:22:ef:46:1f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:ef:46:1f", "endpoint_id": 1, "available": true, @@ -547,22 +419,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:22:ef:46:1f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:ef:46:1f", "endpoint_id": 1, "available": true, @@ -593,22 +449,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:22:ef:46:1f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:ef:46:1f", "endpoint_id": 1, "available": true, @@ -643,22 +483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:22:ef:46:1f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:ef:46:1f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-yvx5lh6k-ts0601.json b/tests/data/devices/tze200-yvx5lh6k-ts0601.json index e29b12837..1c981b7f6 100644 --- a/tests/data/devices/tze200-yvx5lh6k-ts0601.json +++ b/tests/data/devices/tze200-yvx5lh6k-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d5:91:a5:45", "nwk": "0x920A", "manufacturer": "_TZE200_yvx5lh6k", @@ -228,22 +228,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d5:91:a5:45:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:91:a5:45", "endpoint_id": 1, "available": true, @@ -272,22 +256,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d5:91:a5:45:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:91:a5:45", "endpoint_id": 1, "available": true, @@ -316,22 +284,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PM25ClusterHandler", - "generic_id": "cluster_handler_0x042a", - "endpoint_id": 1, - "cluster": { - "id": 1066, - "name": "PM2.5", - "type": "server" - }, - "id": "1:0x042a", - "unique_id": "ab:cd:ef:12:d5:91:a5:45:1:0x042a", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d5:91:a5:45", "endpoint_id": 1, "available": true, @@ -360,22 +312,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0x042e", - "endpoint_id": 1, - "cluster": { - "id": 1070, - "name": "VOC Level", - "type": "server" - }, - "id": "1:0x042e", - "unique_id": "ab:cd:ef:12:d5:91:a5:45:1:0x042e", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:91:a5:45", "endpoint_id": 1, "available": true, @@ -406,22 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d5:91:a5:45:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d5:91:a5:45", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-yw7cahqs-ts0601.json b/tests/data/devices/tze200-yw7cahqs-ts0601.json index ca19e698b..c6193aae4 100644 --- a/tests/data/devices/tze200-yw7cahqs-ts0601.json +++ b/tests/data/devices/tze200-yw7cahqs-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:39:54:17:e4", "nwk": "0xE20B", "manufacturer": "_TZE200_yw7cahqs", @@ -276,22 +276,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -321,22 +305,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2NoSchedule", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -400,22 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -449,22 +401,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -493,22 +429,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -537,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2NoSchedule", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -581,22 +485,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -627,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -675,22 +547,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -723,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -771,22 +611,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -819,22 +643,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -867,22 +675,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, @@ -917,22 +709,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:39:54:17:e4:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:54:17:e4", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze200-ztvwu4nk-ts0601.json b/tests/data/devices/tze200-ztvwu4nk-ts0601.json index 14a9d7457..7dbeeebd5 100644 --- a/tests/data/devices/tze200-ztvwu4nk-ts0601.json +++ b/tests/data/devices/tze200-ztvwu4nk-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4f:5e:45:8e", "nwk": "0x2EF1", "manufacturer": "_TZE200_ztvwu4nk", @@ -147,22 +147,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4f:5e:45:8e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:5e:45:8e", "endpoint_id": 1, "available": true, @@ -191,22 +175,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4f:5e:45:8e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:5e:45:8e", "endpoint_id": 1, "available": true, @@ -237,22 +205,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:4f:5e:45:8e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:5e:45:8e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-1fuxihti-ts0601.json b/tests/data/devices/tze204-1fuxihti-ts0601.json index fa49d786e..e3ba16913 100644 --- a/tests/data/devices/tze204-1fuxihti-ts0601.json +++ b/tests/data/devices/tze204-1fuxihti-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cc:1a:bc:50", "nwk": "0xE150", "manufacturer": "_TZE204_1fuxihti", @@ -189,22 +189,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:cc:1a:bc:50:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:cc:1a:bc:50", "endpoint_id": 1, "available": true, @@ -239,22 +223,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cc:1a:bc:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cc:1a:bc:50", "endpoint_id": 1, "available": true, @@ -283,22 +251,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cc:1a:bc:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cc:1a:bc:50", "endpoint_id": 1, "available": true, @@ -327,22 +279,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:cc:1a:bc:50:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:cc:1a:bc:50", "endpoint_id": 1, "available": true, @@ -373,22 +309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cc:1a:bc:50:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cc:1a:bc:50", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-1v1dxkck-ts0601.json b/tests/data/devices/tze204-1v1dxkck-ts0601.json index 88b15a3a5..3e67fa695 100644 --- a/tests/data/devices/tze204-1v1dxkck-ts0601.json +++ b/tests/data/devices/tze204-1v1dxkck-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c0:71:6b:96", "nwk": "0x546A", "manufacturer": "_TZE204_1v1dxkck", @@ -266,36 +266,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:c0:71:6b:96:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:c0:71:6b:96:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:c0:71:6b:96", "endpoint_id": 1, "available": true, @@ -347,36 +317,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:c0:71:6b:96:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 2, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "2:0x0008", - "unique_id": "ab:cd:ef:12:c0:71:6b:96:2:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:c0:71:6b:96", "endpoint_id": 2, "available": true, @@ -428,36 +368,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:c0:71:6b:96:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 3, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "3:0x0008", - "unique_id": "ab:cd:ef:12:c0:71:6b:96:3:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:c0:71:6b:96", "endpoint_id": 3, "available": true, @@ -511,22 +421,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c0:71:6b:96:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:71:6b:96", "endpoint_id": 1, "available": true, @@ -555,22 +449,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c0:71:6b:96:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:71:6b:96", "endpoint_id": 1, "available": true, @@ -601,22 +479,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c0:71:6b:96:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:71:6b:96", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-1youk3hj-ts0601.json b/tests/data/devices/tze204-1youk3hj-ts0601.json index 948fc0c0e..eb428a6a4 100644 --- a/tests/data/devices/tze204-1youk3hj-ts0601.json +++ b/tests/data/devices/tze204-1youk3hj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f5:c6:9a:7d", "nwk": "0xC1A5", "manufacturer": "_TZE204_1youk3hj", @@ -209,22 +209,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -254,22 +238,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -301,22 +269,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -348,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -395,22 +331,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -442,22 +362,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -491,22 +395,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -540,22 +428,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -584,22 +456,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -628,22 +484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -672,22 +512,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -716,22 +540,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -762,22 +570,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -810,22 +602,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, @@ -860,22 +636,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f5:c6:9a:7d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c6:9a:7d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-4fblxpma-ts0601.json b/tests/data/devices/tze204-4fblxpma-ts0601.json index f137c4960..d69ff525c 100644 --- a/tests/data/devices/tze204-4fblxpma-ts0601.json +++ b/tests/data/devices/tze204-4fblxpma-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f4:04:0c:92", "nwk": "0xD6F2", "manufacturer": "_TZE204_4fblxpma", @@ -270,22 +270,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f4:04:0c:92:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:04:0c:92", "endpoint_id": 1, "available": true, @@ -314,22 +298,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f4:04:0c:92:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:04:0c:92", "endpoint_id": 1, "available": true, @@ -358,22 +326,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:f4:04:0c:92:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:f4:04:0c:92", "endpoint_id": 1, "available": true, @@ -409,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f4:04:0c:92:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f4:04:0c:92", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-58of2pfn-ts0601.json b/tests/data/devices/tze204-58of2pfn-ts0601.json index 29935566c..a5dadde5c 100644 --- a/tests/data/devices/tze204-58of2pfn-ts0601.json +++ b/tests/data/devices/tze204-58of2pfn-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1c:a6:1f:fb", "nwk": "0xDA1B", "manufacturer": "_TZE204_58of2pfn", @@ -279,22 +279,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:1c:a6:1f:fb:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1c:a6:1f:fb", "endpoint_id": 1, "available": true, @@ -345,22 +329,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:1c:a6:1f:fb:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1c:a6:1f:fb", "endpoint_id": 2, "available": true, @@ -411,22 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 3, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "3:0x0006", - "unique_id": "ab:cd:ef:12:1c:a6:1f:fb:3:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1c:a6:1f:fb", "endpoint_id": 3, "available": true, @@ -477,22 +429,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 4, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "4:0x0006", - "unique_id": "ab:cd:ef:12:1c:a6:1f:fb:4:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:1c:a6:1f:fb", "endpoint_id": 4, "available": true, @@ -545,22 +481,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1c:a6:1f:fb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1c:a6:1f:fb", "endpoint_id": 1, "available": true, @@ -589,22 +509,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1c:a6:1f:fb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1c:a6:1f:fb", "endpoint_id": 1, "available": true, @@ -635,22 +539,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1c:a6:1f:fb:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1c:a6:1f:fb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-5slehgeo-ts0601.json b/tests/data/devices/tze204-5slehgeo-ts0601.json index 166747bce..5a0a0e3cf 100644 --- a/tests/data/devices/tze204-5slehgeo-ts0601.json +++ b/tests/data/devices/tze204-5slehgeo-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c2:dc:68:99", "nwk": "0x38DB", "manufacturer": "_TZE204_5slehgeo", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c2:dc:68:99:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c2:dc:68:99", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c2:dc:68:99:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c2:dc:68:99", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c2:dc:68:99:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c2:dc:68:99", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-5toc8efa-ts0601.json b/tests/data/devices/tze204-5toc8efa-ts0601.json index 98329a817..f44763034 100644 --- a/tests/data/devices/tze204-5toc8efa-ts0601.json +++ b/tests/data/devices/tze204-5toc8efa-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:88:70:df:86", "nwk": "0xA4DE", "manufacturer": "_TZE204_5toc8efa", @@ -170,22 +170,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:88:70:df:86:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:88:70:df:86", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:88:70:df:86:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:88:70:df:86", "endpoint_id": 1, "available": true, @@ -260,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:88:70:df:86:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:88:70:df:86", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-7ytb3h8u-ts0601.json b/tests/data/devices/tze204-7ytb3h8u-ts0601.json index f9f6a7f08..2d1353efd 100644 --- a/tests/data/devices/tze204-7ytb3h8u-ts0601.json +++ b/tests/data/devices/tze204-7ytb3h8u-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:66:5d:86:4a", "nwk": "0x3979", "manufacturer": "_TZE204_7ytb3h8u", @@ -326,22 +326,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -373,22 +357,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -420,22 +388,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -469,22 +421,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -516,22 +452,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -567,22 +487,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -611,22 +515,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -655,22 +543,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -706,22 +578,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "TuyaValveWaterConsumedNoInstDemand", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -757,22 +613,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -801,22 +641,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -845,22 +669,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -891,22 +699,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, @@ -935,22 +727,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:66:5d:86:4a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:66:5d:86:4a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-81yrt3lo-ts0601.json b/tests/data/devices/tze204-81yrt3lo-ts0601.json index 858dcfd49..06f35cb4d 100644 --- a/tests/data/devices/tze204-81yrt3lo-ts0601.json +++ b/tests/data/devices/tze204-81yrt3lo-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:22:09:db:75", "nwk": "0xC670", "manufacturer": "_TZE204_81yrt3lo", @@ -925,22 +925,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, @@ -969,22 +953,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, @@ -1013,22 +981,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, @@ -1064,22 +1016,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, @@ -1115,22 +1051,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, @@ -1157,7 +1077,7 @@ "unique_id": "ab:cd:ef:12:22:09:db:75-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1166,22 +1086,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, @@ -1190,7 +1094,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -1215,22 +1119,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, @@ -1264,22 +1152,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, @@ -1312,22 +1184,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, @@ -1360,22 +1216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, @@ -1409,22 +1249,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, @@ -1458,22 +1282,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "ab:cd:ef:12:22:09:db:75:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 2, "available": true, @@ -1509,22 +1317,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "ab:cd:ef:12:22:09:db:75:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 2, "available": true, @@ -1560,22 +1352,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 2, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "2:0x0702", - "unique_id": "ab:cd:ef:12:22:09:db:75:2:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 2, "available": true, @@ -1602,7 +1378,7 @@ "unique_id": "ab:cd:ef:12:22:09:db:75-2-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1611,22 +1387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 2, "available": true, @@ -1635,7 +1395,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 52.5, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -1660,22 +1420,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 2, "available": true, @@ -1708,22 +1452,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 2, "available": true, @@ -1756,22 +1484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 2, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "2:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:2:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 2, "available": true, @@ -1805,22 +1517,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 3, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "3:0x0702", - "unique_id": "ab:cd:ef:12:22:09:db:75:3:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 3, "available": true, @@ -1856,22 +1552,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 3, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "3:0x0702", - "unique_id": "ab:cd:ef:12:22:09:db:75:3:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 3, "available": true, @@ -1907,22 +1587,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 3, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "3:0x0702", - "unique_id": "ab:cd:ef:12:22:09:db:75:3:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 3, "available": true, @@ -1949,7 +1613,7 @@ "unique_id": "ab:cd:ef:12:22:09:db:75-3-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1958,22 +1622,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 3, "available": true, @@ -1982,7 +1630,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 52.5, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -2007,22 +1655,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 3, "available": true, @@ -2055,22 +1687,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "ab:cd:ef:12:22:09:db:75:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 3, "available": true, @@ -2106,22 +1722,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:22:09:db:75:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:22:09:db:75", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-9yapgbuv-ts0601.json b/tests/data/devices/tze204-9yapgbuv-ts0601.json index 1c880376a..99df3db4f 100644 --- a/tests/data/devices/tze204-9yapgbuv-ts0601.json +++ b/tests/data/devices/tze204-9yapgbuv-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:3f:d8:c2:76", "nwk": "0x1E96", "manufacturer": "_TZE204_9yapgbuv", @@ -184,22 +184,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:3f:d8:c2:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3f:d8:c2:76", "endpoint_id": 1, "available": true, @@ -233,22 +217,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3f:d8:c2:76:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3f:d8:c2:76", "endpoint_id": 1, "available": true, @@ -277,22 +245,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3f:d8:c2:76:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3f:d8:c2:76", "endpoint_id": 1, "available": true, @@ -321,22 +273,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:3f:d8:c2:76:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:3f:d8:c2:76", "endpoint_id": 1, "available": true, @@ -372,22 +308,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:3f:d8:c2:76:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:3f:d8:c2:76", "endpoint_id": 1, "available": true, @@ -416,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:3f:d8:c2:76:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:3f:d8:c2:76", "endpoint_id": 1, "available": true, @@ -462,22 +366,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:3f:d8:c2:76:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3f:d8:c2:76", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-a2jcoyuk-ts0601.json b/tests/data/devices/tze204-a2jcoyuk-ts0601.json index 93e241981..b9861cc35 100644 --- a/tests/data/devices/tze204-a2jcoyuk-ts0601.json +++ b/tests/data/devices/tze204-a2jcoyuk-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5a:34:d8:e0", "nwk": "0x91C0", "manufacturer": "_TZE204_a2jcoyuk", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5a:34:d8:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:34:d8:e0", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5a:34:d8:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:34:d8:e0", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5a:34:d8:e0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5a:34:d8:e0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-ai4rqhky-ts0601.json b/tests/data/devices/tze204-ai4rqhky-ts0601.json index d4e46712c..aff8efc3b 100644 --- a/tests/data/devices/tze204-ai4rqhky-ts0601.json +++ b/tests/data/devices/tze204-ai4rqhky-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b1:50:cc:53", "nwk": "0x0600", "manufacturer": "_TZE204_ai4rqhky", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:50:cc:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:50:cc:53", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b1:50:cc:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:50:cc:53", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b1:50:cc:53:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b1:50:cc:53", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-aoclfnxz-ts0601.json b/tests/data/devices/tze204-aoclfnxz-ts0601.json index 437abe534..4eea62b50 100644 --- a/tests/data/devices/tze204-aoclfnxz-ts0601.json +++ b/tests/data/devices/tze204-aoclfnxz-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2d:91:c5:14", "nwk": "0x12A4", "manufacturer": "_TZE204_aoclfnxz", @@ -213,22 +213,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2d:91:c5:14:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2d:91:c5:14", "endpoint_id": 1, "available": true, @@ -257,22 +241,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2d:91:c5:14:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2d:91:c5:14", "endpoint_id": 1, "available": true, @@ -303,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:2d:91:c5:14:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2d:91:c5:14", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-bkkmqmyo-ts0601.json b/tests/data/devices/tze204-bkkmqmyo-ts0601.json index ca84bf02f..048cef063 100644 --- a/tests/data/devices/tze204-bkkmqmyo-ts0601.json +++ b/tests/data/devices/tze204-bkkmqmyo-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:83:e9:5e:8c", "nwk": "0x442E", "manufacturer": "_TZE204_bkkmqmyo", @@ -453,22 +453,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:83:e9:5e:8c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:83:e9:5e:8c", "endpoint_id": 1, "available": true, @@ -497,22 +481,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:83:e9:5e:8c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:83:e9:5e:8c", "endpoint_id": 1, "available": true, @@ -541,22 +509,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:83:e9:5e:8c:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:83:e9:5e:8c", "endpoint_id": 1, "available": true, @@ -591,22 +543,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:83:e9:5e:8c:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:83:e9:5e:8c", "endpoint_id": 1, "available": true, @@ -632,7 +568,7 @@ "unique_id": "ab:cd:ef:12:83:e9:5e:8c-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -641,22 +577,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:83:e9:5e:8c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:83:e9:5e:8c", "endpoint_id": 1, "available": true, @@ -665,7 +585,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 10.0 }, @@ -689,22 +609,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:83:e9:5e:8c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:83:e9:5e:8c", "endpoint_id": 1, "available": true, @@ -737,22 +641,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:83:e9:5e:8c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:83:e9:5e:8c", "endpoint_id": 1, "available": true, @@ -784,22 +672,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:83:e9:5e:8c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:83:e9:5e:8c", "endpoint_id": 1, "available": true, @@ -834,22 +706,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:83:e9:5e:8c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:83:e9:5e:8c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-bxoo2swd-ts0601.json b/tests/data/devices/tze204-bxoo2swd-ts0601.json index 5738ecaa0..1a6151845 100644 --- a/tests/data/devices/tze204-bxoo2swd-ts0601.json +++ b/tests/data/devices/tze204-bxoo2swd-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ba:5e:9c:07", "nwk": "0x9318", "manufacturer": "_TZE204_bxoo2swd", @@ -203,36 +203,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ba:5e:9c:07:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ba:5e:9c:07:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ba:5e:9c:07", "endpoint_id": 1, "available": true, @@ -284,36 +254,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:ba:5e:9c:07:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 2, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "2:0x0008", - "unique_id": "ab:cd:ef:12:ba:5e:9c:07:2:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ba:5e:9c:07", "endpoint_id": 2, "available": true, @@ -367,22 +307,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ba:5e:9c:07:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:5e:9c:07", "endpoint_id": 1, "available": true, @@ -411,22 +335,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ba:5e:9c:07:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:5e:9c:07", "endpoint_id": 1, "available": true, @@ -457,22 +365,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ba:5e:9c:07:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:5e:9c:07", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-c2fmom5z-ts0601.json b/tests/data/devices/tze204-c2fmom5z-ts0601.json index 4241fc729..9d160ada5 100644 --- a/tests/data/devices/tze204-c2fmom5z-ts0601.json +++ b/tests/data/devices/tze204-c2fmom5z-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e1:f5:c9:be", "nwk": "0x3F2F", "manufacturer": "_TZE204_c2fmom5z", @@ -376,22 +376,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e1:f5:c9:be:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:f5:c9:be", "endpoint_id": 1, "available": true, @@ -420,22 +404,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e1:f5:c9:be:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:f5:c9:be", "endpoint_id": 1, "available": true, @@ -464,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:e1:f5:c9:be:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e1:f5:c9:be", "endpoint_id": 1, "available": true, @@ -508,22 +460,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:e1:f5:c9:be:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e1:f5:c9:be", "endpoint_id": 1, "available": true, @@ -552,22 +488,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "CarbonDioxideConcentrationClusterHandler", - "generic_id": "cluster_handler_0x040d", - "endpoint_id": 1, - "cluster": { - "id": 1037, - "name": "Carbon Dioxide (CO\u2082) Concentration", - "type": "server" - }, - "id": "1:0x040d", - "unique_id": "ab:cd:ef:12:e1:f5:c9:be:1:0x040d", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e1:f5:c9:be", "endpoint_id": 1, "available": true, @@ -596,22 +516,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PM25ClusterHandler", - "generic_id": "cluster_handler_0x042a", - "endpoint_id": 1, - "cluster": { - "id": 1066, - "name": "PM2.5", - "type": "server" - }, - "id": "1:0x042a", - "unique_id": "ab:cd:ef:12:e1:f5:c9:be:1:0x042a", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e1:f5:c9:be", "endpoint_id": 1, "available": true, @@ -640,22 +544,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "FormaldehydeConcentrationClusterHandler", - "generic_id": "cluster_handler_0x042b", - "endpoint_id": 1, - "cluster": { - "id": 1067, - "name": "Formaldehyde Concentration", - "type": "server" - }, - "id": "1:0x042b", - "unique_id": "ab:cd:ef:12:e1:f5:c9:be:1:0x042b", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e1:f5:c9:be", "endpoint_id": 1, "available": true, @@ -684,22 +572,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0x042e", - "endpoint_id": 1, - "cluster": { - "id": 1070, - "name": "VOC Level", - "type": "server" - }, - "id": "1:0x042e", - "unique_id": "ab:cd:ef:12:e1:f5:c9:be:1:0x042e", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:f5:c9:be", "endpoint_id": 1, "available": true, @@ -730,22 +602,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e1:f5:c9:be:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e1:f5:c9:be", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-chbyv06x-ts0601.json b/tests/data/devices/tze204-chbyv06x-ts0601.json index bce1fe052..f6517440c 100644 --- a/tests/data/devices/tze204-chbyv06x-ts0601.json +++ b/tests/data/devices/tze204-chbyv06x-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:85:7c:cd:63", "nwk": "0x069D", "manufacturer": "_TZE204_chbyv06x", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:85:7c:cd:63:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:7c:cd:63", "endpoint_id": 1, "available": true, @@ -226,22 +210,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:7c:cd:63:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:7c:cd:63", "endpoint_id": 1, "available": true, @@ -269,22 +237,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:7c:cd:63:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:7c:cd:63", "endpoint_id": 1, "available": true, @@ -314,22 +266,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:7c:cd:63:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:7c:cd:63", "endpoint_id": 1, "available": true, @@ -363,22 +299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:7c:cd:63:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:7c:cd:63", "endpoint_id": 1, "available": true, @@ -415,22 +335,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:7c:cd:63:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:7c:cd:63", "endpoint_id": 1, "available": true, @@ -459,22 +363,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:85:7c:cd:63:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:7c:cd:63", "endpoint_id": 1, "available": true, @@ -503,22 +391,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:7c:cd:63:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:7c:cd:63", "endpoint_id": 1, "available": true, @@ -547,22 +419,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:7c:cd:63:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:7c:cd:63", "endpoint_id": 1, "available": true, @@ -593,22 +449,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:85:7c:cd:63:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:7c:cd:63", "endpoint_id": 1, "available": true, @@ -643,22 +483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:85:7c:cd:63:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:85:7c:cd:63", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-cirvgep4-ts0601.json b/tests/data/devices/tze204-cirvgep4-ts0601.json index 6fc79c582..0b0a7da9d 100644 --- a/tests/data/devices/tze204-cirvgep4-ts0601.json +++ b/tests/data/devices/tze204-cirvgep4-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:46:04:97:a0", "nwk": "0xCFC5", "manufacturer": "_TZE204_cirvgep4", @@ -209,22 +209,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:46:04:97:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:46:04:97:a0", "endpoint_id": 1, "available": true, @@ -258,22 +242,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:46:04:97:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:46:04:97:a0", "endpoint_id": 1, "available": true, @@ -302,22 +270,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:46:04:97:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:46:04:97:a0", "endpoint_id": 1, "available": true, @@ -346,22 +298,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:46:04:97:a0:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:46:04:97:a0", "endpoint_id": 1, "available": true, @@ -397,22 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:46:04:97:a0:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:46:04:97:a0", "endpoint_id": 1, "available": true, @@ -441,22 +361,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:46:04:97:a0:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:46:04:97:a0", "endpoint_id": 1, "available": true, @@ -487,22 +391,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:46:04:97:a0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:46:04:97:a0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-cjbofhxw-ts0601.json b/tests/data/devices/tze204-cjbofhxw-ts0601.json index ba88f4315..f88b8a306 100644 --- a/tests/data/devices/tze204-cjbofhxw-ts0601.json +++ b/tests/data/devices/tze204-cjbofhxw-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5e:f5:c9:72", "nwk": "0x3DA7", "manufacturer": "_TZE204_cjbofhxw", @@ -390,22 +390,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:f5:c9:72:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:f5:c9:72", "endpoint_id": 1, "available": true, @@ -434,22 +418,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:f5:c9:72:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:f5:c9:72", "endpoint_id": 1, "available": true, @@ -478,22 +446,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:5e:f5:c9:72:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:5e:f5:c9:72", "endpoint_id": 1, "available": true, @@ -528,22 +480,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5e:f5:c9:72:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:f5:c9:72", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-d6i25bwg-ts0601.json b/tests/data/devices/tze204-d6i25bwg-ts0601.json index 0b95be0ea..c5ee8c110 100644 --- a/tests/data/devices/tze204-d6i25bwg-ts0601.json +++ b/tests/data/devices/tze204-d6i25bwg-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c0:3f:e3:79", "nwk": "0xBF9B", "manufacturer": "_TZE204_d6i25bwg", @@ -203,22 +203,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c0:3f:e3:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:3f:e3:79", "endpoint_id": 1, "available": true, @@ -247,22 +231,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c0:3f:e3:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:3f:e3:79", "endpoint_id": 1, "available": true, @@ -291,22 +259,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:c0:3f:e3:79:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c0:3f:e3:79", "endpoint_id": 1, "available": true, @@ -335,22 +287,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:c0:3f:e3:79:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:c0:3f:e3:79", "endpoint_id": 1, "available": true, @@ -381,22 +317,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c0:3f:e3:79:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:3f:e3:79", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-dqolcpcp-ts0601.json b/tests/data/devices/tze204-dqolcpcp-ts0601.json index a38705050..682d2d03c 100644 --- a/tests/data/devices/tze204-dqolcpcp-ts0601.json +++ b/tests/data/devices/tze204-dqolcpcp-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d2:57:29:bb", "nwk": "0x67FC", "manufacturer": "_TZE204_dqolcpcp", @@ -557,22 +557,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:57:29:bb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:57:29:bb", "endpoint_id": 1, "available": true, @@ -601,22 +585,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:57:29:bb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:57:29:bb", "endpoint_id": 1, "available": true, @@ -647,22 +615,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d2:57:29:bb:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:57:29:bb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-dtzziy1e-ts0601.json b/tests/data/devices/tze204-dtzziy1e-ts0601.json index 7d331bfe4..d56409f92 100644 --- a/tests/data/devices/tze204-dtzziy1e-ts0601.json +++ b/tests/data/devices/tze204-dtzziy1e-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:39:6f:a3:20", "nwk": "0x4EA2", "manufacturer": "_TZE204_dtzziy1e", @@ -166,22 +166,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -211,22 +195,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -258,22 +226,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -305,22 +257,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -352,22 +288,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -399,22 +319,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -446,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -493,22 +381,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -540,22 +412,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -587,22 +443,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -636,22 +476,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -683,22 +507,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -730,22 +538,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -777,22 +569,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -826,22 +602,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -875,22 +635,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -919,22 +663,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -963,22 +691,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -1007,22 +719,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, @@ -1053,22 +749,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:39:6f:a3:20:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:a3:20", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-dwcarsat-ts0601.json b/tests/data/devices/tze204-dwcarsat-ts0601.json index a0fd28419..720cf239b 100644 --- a/tests/data/devices/tze204-dwcarsat-ts0601.json +++ b/tests/data/devices/tze204-dwcarsat-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:09:0a:75:a0", "nwk": "0x1397", "manufacturer": "_TZE204_dwcarsat", @@ -255,22 +255,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:09:0a:75:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:09:0a:75:a0", "endpoint_id": 1, "available": true, @@ -299,22 +283,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:09:0a:75:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:09:0a:75:a0", "endpoint_id": 1, "available": true, @@ -343,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:09:0a:75:a0:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:09:0a:75:a0", "endpoint_id": 1, "available": true, @@ -387,22 +339,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:09:0a:75:a0:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:09:0a:75:a0", "endpoint_id": 1, "available": true, @@ -431,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "CarbonDioxideConcentrationClusterHandler", - "generic_id": "cluster_handler_0x040d", - "endpoint_id": 1, - "cluster": { - "id": 1037, - "name": "Carbon Dioxide (CO\u2082) Concentration", - "type": "server" - }, - "id": "1:0x040d", - "unique_id": "ab:cd:ef:12:09:0a:75:a0:1:0x040d", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:09:0a:75:a0", "endpoint_id": 1, "available": true, @@ -475,22 +395,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PM25ClusterHandler", - "generic_id": "cluster_handler_0x042a", - "endpoint_id": 1, - "cluster": { - "id": 1066, - "name": "PM2.5", - "type": "server" - }, - "id": "1:0x042a", - "unique_id": "ab:cd:ef:12:09:0a:75:a0:1:0x042a", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:09:0a:75:a0", "endpoint_id": 1, "available": true, @@ -519,22 +423,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "FormaldehydeConcentrationClusterHandler", - "generic_id": "cluster_handler_0x042b", - "endpoint_id": 1, - "cluster": { - "id": 1067, - "name": "Formaldehyde Concentration", - "type": "server" - }, - "id": "1:0x042b", - "unique_id": "ab:cd:ef:12:09:0a:75:a0:1:0x042b", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:09:0a:75:a0", "endpoint_id": 1, "available": true, @@ -563,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0x042e", - "endpoint_id": 1, - "cluster": { - "id": 1070, - "name": "VOC Level", - "type": "server" - }, - "id": "1:0x042e", - "unique_id": "ab:cd:ef:12:09:0a:75:a0:1:0x042e", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:09:0a:75:a0", "endpoint_id": 1, "available": true, @@ -609,22 +481,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:09:0a:75:a0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:09:0a:75:a0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-eekpf0ft-ts0601.json b/tests/data/devices/tze204-eekpf0ft-ts0601.json index e3a90a840..538d268b6 100644 --- a/tests/data/devices/tze204-eekpf0ft-ts0601.json +++ b/tests/data/devices/tze204-eekpf0ft-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1f:0c:bc:56", "nwk": "0x0C04", "manufacturer": "_TZE204_eekpf0ft", @@ -178,22 +178,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1f:0c:bc:56:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1f:0c:bc:56", "endpoint_id": 1, "available": true, @@ -222,22 +206,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1f:0c:bc:56:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1f:0c:bc:56", "endpoint_id": 1, "available": true, @@ -268,22 +236,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1f:0c:bc:56:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1f:0c:bc:56", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-ex3rcdha-ts0601.json b/tests/data/devices/tze204-ex3rcdha-ts0601.json index 8f5e1327c..2900dbfeb 100644 --- a/tests/data/devices/tze204-ex3rcdha-ts0601.json +++ b/tests/data/devices/tze204-ex3rcdha-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d9:08:34:09", "nwk": "0x244A", "manufacturer": "_TZE204_ex3rcdha", @@ -488,22 +488,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -533,22 +517,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 1, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "1:0x000d", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -580,22 +548,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -627,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -674,22 +610,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -721,22 +641,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -768,22 +672,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -815,22 +703,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -862,22 +734,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -909,22 +765,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 2, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "2:0x000d", - "unique_id": "ab:cd:ef:12:d9:08:34:09:2:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 2, "available": true, @@ -956,22 +796,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 3, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "3:0x000d", - "unique_id": "ab:cd:ef:12:d9:08:34:09:3:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 3, "available": true, @@ -1003,22 +827,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 4, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "4:0x000d", - "unique_id": "ab:cd:ef:12:d9:08:34:09:4:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 4, "available": true, @@ -1050,22 +858,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 5, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "5:0x000d", - "unique_id": "ab:cd:ef:12:d9:08:34:09:5:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 5, "available": true, @@ -1099,22 +891,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -1143,22 +919,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -1187,22 +947,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogInputClusterHandler", - "generic_id": "cluster_handler_0x000c", - "endpoint_id": 1, - "cluster": { - "id": 12, - "name": "AnalogInput", - "type": "server" - }, - "id": "1:0x000c", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0x000c", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, @@ -1233,22 +977,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d9:08:34:09:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d9:08:34:09", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-fhvdgeuh-ts0601.json b/tests/data/devices/tze204-fhvdgeuh-ts0601.json index 6a73290a3..4567a5b8a 100644 --- a/tests/data/devices/tze204-fhvdgeuh-ts0601.json +++ b/tests/data/devices/tze204-fhvdgeuh-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:93:4b:fc:2f", "nwk": "0xA181", "manufacturer": "_TZE204_fhvdgeuh", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:93:4b:fc:2f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:4b:fc:2f", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:93:4b:fc:2f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:4b:fc:2f", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:93:4b:fc:2f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:93:4b:fc:2f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-g2ki0ejr-ts0601.json b/tests/data/devices/tze204-g2ki0ejr-ts0601.json index f105fb325..6f0013d27 100644 --- a/tests/data/devices/tze204-g2ki0ejr-ts0601.json +++ b/tests/data/devices/tze204-g2ki0ejr-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:47:a5:c0:28", "nwk": "0xA335", "manufacturer": "_TZE204_g2ki0ejr", @@ -141,22 +141,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:47:a5:c0:28:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:a5:c0:28", "endpoint_id": 1, "available": true, @@ -185,22 +169,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:47:a5:c0:28:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:a5:c0:28", "endpoint_id": 1, "available": true, @@ -231,22 +199,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:47:a5:c0:28:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:47:a5:c0:28", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-goecjd1t-ts0601.json b/tests/data/devices/tze204-goecjd1t-ts0601.json index b9e49b78e..d3e593ffd 100644 --- a/tests/data/devices/tze204-goecjd1t-ts0601.json +++ b/tests/data/devices/tze204-goecjd1t-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:87:3c:45:da", "nwk": "0x912E", "manufacturer": "_TZE204_goecjd1t", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:87:3c:45:da:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:87:3c:45:da", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:87:3c:45:da:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:87:3c:45:da", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:87:3c:45:da:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:87:3c:45:da", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-gops3slb-ts0601.json b/tests/data/devices/tze204-gops3slb-ts0601.json index 59b814d94..fe0c2ff08 100644 --- a/tests/data/devices/tze204-gops3slb-ts0601.json +++ b/tests/data/devices/tze204-gops3slb-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:72:cf:0d:25", "nwk": "0xC569", "manufacturer": "_TZE204_gops3slb", @@ -244,22 +244,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -289,22 +273,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -368,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -415,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -462,22 +398,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -511,22 +431,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -560,22 +464,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -608,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -656,22 +528,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -707,22 +563,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -751,22 +591,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -795,22 +619,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -841,22 +649,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -889,22 +681,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -937,22 +713,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, @@ -987,22 +747,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:72:cf:0d:25:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:72:cf:0d:25", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-guvc7pdy-ts0601.json b/tests/data/devices/tze204-guvc7pdy-ts0601.json index a827b12e1..743c09829 100644 --- a/tests/data/devices/tze204-guvc7pdy-ts0601.json +++ b/tests/data/devices/tze204-guvc7pdy-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d4:fe:8a:21", "nwk": "0xC208", "manufacturer": "_TZE204_guvc7pdy", @@ -238,22 +238,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:d4:fe:8a:21:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:d4:fe:8a:21", "endpoint_id": 1, "available": true, @@ -288,22 +272,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d4:fe:8a:21:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:fe:8a:21", "endpoint_id": 1, "available": true, @@ -332,22 +300,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d4:fe:8a:21:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:fe:8a:21", "endpoint_id": 1, "available": true, @@ -378,22 +330,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d4:fe:8a:21:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:fe:8a:21", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-hlx9tnzb-ts0601.json b/tests/data/devices/tze204-hlx9tnzb-ts0601.json index 7d050ec6a..99070d358 100644 --- a/tests/data/devices/tze204-hlx9tnzb-ts0601.json +++ b/tests/data/devices/tze204-hlx9tnzb-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:15:a1:f1:a8", "nwk": "0x9FE6", "manufacturer": "_TZE204_hlx9tnzb", @@ -209,36 +209,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:15:a1:f1:a8:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:15:a1:f1:a8:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:15:a1:f1:a8", "endpoint_id": 1, "available": true, @@ -292,22 +262,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:15:a1:f1:a8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:a1:f1:a8", "endpoint_id": 1, "available": true, @@ -336,22 +290,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:15:a1:f1:a8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:a1:f1:a8", "endpoint_id": 1, "available": true, @@ -382,22 +320,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:15:a1:f1:a8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:a1:f1:a8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-iaeejhvf-ts0601.json b/tests/data/devices/tze204-iaeejhvf-ts0601.json index 3eb7620cb..ced57c4ea 100644 --- a/tests/data/devices/tze204-iaeejhvf-ts0601.json +++ b/tests/data/devices/tze204-iaeejhvf-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:52:88:1c:b0", "nwk": "0x51C6", "manufacturer": "_TZE204_iaeejhvf", @@ -518,22 +518,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -563,22 +547,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 1, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "1:0x000d", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -610,22 +578,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -657,22 +609,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -704,22 +640,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -751,22 +671,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -798,22 +702,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -845,22 +733,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -892,22 +764,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -939,22 +795,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -986,22 +826,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -1033,22 +857,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 2, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "2:0x000d", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:2:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 2, "available": true, @@ -1080,22 +888,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 3, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "3:0x000d", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:3:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 3, "available": true, @@ -1127,22 +919,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 4, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "4:0x000d", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:4:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 4, "available": true, @@ -1174,22 +950,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 5, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "5:0x000d", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:5:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 5, "available": true, @@ -1223,22 +983,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -1270,22 +1014,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -1317,22 +1045,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -1364,22 +1076,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -1413,22 +1109,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -1462,22 +1142,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -1506,22 +1170,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -1550,22 +1198,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -1594,22 +1226,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogInputClusterHandler", - "generic_id": "cluster_handler_0x000c", - "endpoint_id": 1, - "cluster": { - "id": 12, - "name": "AnalogInput", - "type": "server" - }, - "id": "1:0x000c", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0x000c", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -1638,22 +1254,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, @@ -1684,22 +1284,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:52:88:1c:b0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:52:88:1c:b0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-ijxvkhd0-ts0601.json b/tests/data/devices/tze204-ijxvkhd0-ts0601.json index a5350eb14..9483c5673 100644 --- a/tests/data/devices/tze204-ijxvkhd0-ts0601.json +++ b/tests/data/devices/tze204-ijxvkhd0-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:78:4c:6e:1d", "nwk": "0xA7C0", "manufacturer": "_TZE204_ijxvkhd0", @@ -170,22 +170,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:78:4c:6e:1d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:78:4c:6e:1d", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:78:4c:6e:1d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:78:4c:6e:1d", "endpoint_id": 1, "available": true, @@ -260,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:78:4c:6e:1d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:78:4c:6e:1d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-jrcfsaa3-ts0601.json b/tests/data/devices/tze204-jrcfsaa3-ts0601.json index be3bcfb3f..f8d5adcd5 100644 --- a/tests/data/devices/tze204-jrcfsaa3-ts0601.json +++ b/tests/data/devices/tze204-jrcfsaa3-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:92:85:7f:ad", "nwk": "0xEA6C", "manufacturer": "_TZE204_jrcfsaa3", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:92:85:7f:ad:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:92:85:7f:ad", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:92:85:7f:ad:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:92:85:7f:ad", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:92:85:7f:ad:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:92:85:7f:ad", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-k7mfgaen-ts0601.json b/tests/data/devices/tze204-k7mfgaen-ts0601.json index 88596f3d6..80a43fc49 100644 --- a/tests/data/devices/tze204-k7mfgaen-ts0601.json +++ b/tests/data/devices/tze204-k7mfgaen-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1d:f6:05:38", "nwk": "0xE3FC", "manufacturer": "_TZE204_k7mfgaen", @@ -208,22 +208,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1d:f6:05:38:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1d:f6:05:38", "endpoint_id": 1, "available": true, @@ -253,22 +237,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1d:f6:05:38:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1d:f6:05:38", "endpoint_id": 1, "available": true, @@ -302,22 +270,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1d:f6:05:38:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1d:f6:05:38", "endpoint_id": 1, "available": true, @@ -351,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1d:f6:05:38:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1d:f6:05:38", "endpoint_id": 1, "available": true, @@ -409,22 +345,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1d:f6:05:38:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1d:f6:05:38", "endpoint_id": 1, "available": true, @@ -460,22 +380,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1d:f6:05:38:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1d:f6:05:38", "endpoint_id": 1, "available": true, @@ -504,22 +408,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1d:f6:05:38:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1d:f6:05:38", "endpoint_id": 1, "available": true, @@ -550,22 +438,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1d:f6:05:38:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1d:f6:05:38", "endpoint_id": 1, "available": true, @@ -600,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1d:f6:05:38:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1d:f6:05:38", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-kobbcyum-ts0601.json b/tests/data/devices/tze204-kobbcyum-ts0601.json index 0a4066f5f..767d386dd 100644 --- a/tests/data/devices/tze204-kobbcyum-ts0601.json +++ b/tests/data/devices/tze204-kobbcyum-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5e:76:55:79", "nwk": "0x5CDE", "manufacturer": "_TZE204_kobbcyum", @@ -210,22 +210,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:76:55:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:76:55:79", "endpoint_id": 1, "available": true, @@ -254,22 +238,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:76:55:79:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:76:55:79", "endpoint_id": 1, "available": true, @@ -300,22 +268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5e:76:55:79:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:76:55:79", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-kyhbrfyl-ts0601.json b/tests/data/devices/tze204-kyhbrfyl-ts0601.json index 71fbf30ca..c1a143505 100644 --- a/tests/data/devices/tze204-kyhbrfyl-ts0601.json +++ b/tests/data/devices/tze204-kyhbrfyl-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8d:c7:bc:8a", "nwk": "0x743E", "manufacturer": "_TZE204_kyhbrfyl", @@ -180,22 +180,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:8d:c7:bc:8a:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:8d:c7:bc:8a", "endpoint_id": 1, "available": true, @@ -225,22 +209,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8d:c7:bc:8a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c7:bc:8a", "endpoint_id": 1, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8d:c7:bc:8a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c7:bc:8a", "endpoint_id": 1, "available": true, @@ -319,22 +271,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8d:c7:bc:8a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c7:bc:8a", "endpoint_id": 1, "available": true, @@ -366,22 +302,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8d:c7:bc:8a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c7:bc:8a", "endpoint_id": 1, "available": true, @@ -415,22 +335,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:c7:bc:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c7:bc:8a", "endpoint_id": 1, "available": true, @@ -459,22 +363,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8d:c7:bc:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c7:bc:8a", "endpoint_id": 1, "available": true, @@ -503,22 +391,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8d:c7:bc:8a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c7:bc:8a", "endpoint_id": 1, "available": true, @@ -547,22 +419,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8d:c7:bc:8a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c7:bc:8a", "endpoint_id": 1, "available": true, @@ -593,22 +449,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8d:c7:bc:8a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8d:c7:bc:8a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-l8xiyymq-ts0601.json b/tests/data/devices/tze204-l8xiyymq-ts0601.json index 28dd10473..405c37037 100644 --- a/tests/data/devices/tze204-l8xiyymq-ts0601.json +++ b/tests/data/devices/tze204-l8xiyymq-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1e:f8:60:0e", "nwk": "0xD8D5", "manufacturer": "_TZE204_l8xiyymq", @@ -179,22 +179,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1e:f8:60:0e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1e:f8:60:0e", "endpoint_id": 1, "available": true, @@ -223,22 +207,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1e:f8:60:0e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1e:f8:60:0e", "endpoint_id": 1, "available": true, @@ -269,22 +237,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1e:f8:60:0e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1e:f8:60:0e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-lb0fsvba-ts0601.json b/tests/data/devices/tze204-lb0fsvba-ts0601.json index 04653e6f0..dfe0427ec 100644 --- a/tests/data/devices/tze204-lb0fsvba-ts0601.json +++ b/tests/data/devices/tze204-lb0fsvba-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a6:30:4a:e7", "nwk": "0xD20C", "manufacturer": "_TZE204_lb0fsvba", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a6:30:4a:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:30:4a:e7", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a6:30:4a:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:30:4a:e7", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a6:30:4a:e7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a6:30:4a:e7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-lbbg34rj-ts0601.json b/tests/data/devices/tze204-lbbg34rj-ts0601.json index cc7cc91b9..87215b07f 100644 --- a/tests/data/devices/tze204-lbbg34rj-ts0601.json +++ b/tests/data/devices/tze204-lbbg34rj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4e:2f:91:65", "nwk": "0xF0EE", "manufacturer": "_TZE204_lbbg34rj", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4e:2f:91:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:2f:91:65", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4e:2f:91:65:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:2f:91:65", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:4e:2f:91:65:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:2f:91:65", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-lpedvtvr-ts0601.json b/tests/data/devices/tze204-lpedvtvr-ts0601.json index f2b62832f..0905755e1 100644 --- a/tests/data/devices/tze204-lpedvtvr-ts0601.json +++ b/tests/data/devices/tze204-lpedvtvr-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:3b:28:22:86", "nwk": "0xA88C", "manufacturer": "_TZE204_lpedvtvr", @@ -335,22 +335,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:3b:28:22:86:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:3b:28:22:86", "endpoint_id": 1, "available": true, @@ -414,22 +398,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:3b:28:22:86:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3b:28:22:86", "endpoint_id": 1, "available": true, @@ -466,22 +434,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3b:28:22:86:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3b:28:22:86", "endpoint_id": 1, "available": true, @@ -510,22 +462,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:3b:28:22:86:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3b:28:22:86", "endpoint_id": 1, "available": true, @@ -554,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:3b:28:22:86:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:3b:28:22:86", "endpoint_id": 1, "available": true, @@ -598,22 +518,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:3b:28:22:86:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:3b:28:22:86", "endpoint_id": 1, "available": true, @@ -644,22 +548,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:3b:28:22:86:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:3b:28:22:86", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-lsanae15-ts0601.json b/tests/data/devices/tze204-lsanae15-ts0601.json index 0543cd8fb..ecbfdfc2d 100644 --- a/tests/data/devices/tze204-lsanae15-ts0601.json +++ b/tests/data/devices/tze204-lsanae15-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:71:3e:33:41", "nwk": "0xF465", "manufacturer": "_TZE204_lsanae15", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:71:3e:33:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:3e:33:41", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:71:3e:33:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:3e:33:41", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:71:3e:33:41:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:3e:33:41", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-ltwbm23f-ts0601.json b/tests/data/devices/tze204-ltwbm23f-ts0601.json index 36bfeedcc..3bb138d58 100644 --- a/tests/data/devices/tze204-ltwbm23f-ts0601.json +++ b/tests/data/devices/tze204-ltwbm23f-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:1b:1e:95:0a", "nwk": "0x616B", "manufacturer": "_TZE204_ltwbm23f", @@ -283,22 +283,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -328,22 +312,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -407,22 +375,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -454,22 +406,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -501,22 +437,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -548,22 +468,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -595,22 +499,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -642,22 +530,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -691,22 +563,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -739,22 +595,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -786,22 +626,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -833,22 +657,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -881,22 +689,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -932,22 +724,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -976,22 +752,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -1020,22 +780,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -1071,22 +815,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -1115,22 +843,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -1161,22 +873,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -1209,22 +905,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, @@ -1259,22 +939,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:1b:1e:95:0a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:1b:1e:95:0a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-lzriup1j-ts0601.json b/tests/data/devices/tze204-lzriup1j-ts0601.json index 7684e11f0..8ba5a3d01 100644 --- a/tests/data/devices/tze204-lzriup1j-ts0601.json +++ b/tests/data/devices/tze204-lzriup1j-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e0:67:39:b1", "nwk": "0xCA3E", "manufacturer": "_TZE204_lzriup1j", @@ -207,22 +207,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -252,22 +236,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -331,22 +299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -378,22 +330,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -427,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -476,22 +396,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -524,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -572,22 +460,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -623,22 +495,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -667,22 +523,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -711,22 +551,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -757,22 +581,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -805,22 +613,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -853,22 +645,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, @@ -903,22 +679,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e0:67:39:b1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e0:67:39:b1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-m64smti7-ts0601.json b/tests/data/devices/tze204-m64smti7-ts0601.json index b618d376e..31d401b4a 100644 --- a/tests/data/devices/tze204-m64smti7-ts0601.json +++ b/tests/data/devices/tze204-m64smti7-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:34:4e:33:23", "nwk": "0x4CBF", "manufacturer": "_TZE204_m64smti7", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:34:4e:33:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:4e:33:23", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:34:4e:33:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:4e:33:23", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:34:4e:33:23:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:4e:33:23", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-m9dzckna-ts0601.json b/tests/data/devices/tze204-m9dzckna-ts0601.json index cb8aca90f..036d002b1 100644 --- a/tests/data/devices/tze204-m9dzckna-ts0601.json +++ b/tests/data/devices/tze204-m9dzckna-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:69:e0:45:b0", "nwk": "0x3990", "manufacturer": "_TZE204_m9dzckna", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:69:e0:45:b0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:69:e0:45:b0", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:69:e0:45:b0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:69:e0:45:b0", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:69:e0:45:b0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:69:e0:45:b0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-mpbki2zm-ts0601.json b/tests/data/devices/tze204-mpbki2zm-ts0601.json index b43f93398..5e7a23123 100644 --- a/tests/data/devices/tze204-mpbki2zm-ts0601.json +++ b/tests/data/devices/tze204-mpbki2zm-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:fd:bc:e2:8f", "nwk": "0x32D0", "manufacturer": "_TZE204_mpbki2zm", @@ -170,22 +170,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fd:bc:e2:8f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fd:bc:e2:8f", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fd:bc:e2:8f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fd:bc:e2:8f", "endpoint_id": 1, "available": true, @@ -260,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:fd:bc:e2:8f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fd:bc:e2:8f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-mtoaryre-ts0601.json b/tests/data/devices/tze204-mtoaryre-ts0601.json index 6b20156ee..bdff5292d 100644 --- a/tests/data/devices/tze204-mtoaryre-ts0601.json +++ b/tests/data/devices/tze204-mtoaryre-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:de:e2:3f:ea", "nwk": "0xD473", "manufacturer": "_TZE204_mtoaryre", @@ -196,22 +196,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -241,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -288,22 +256,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -335,22 +287,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -382,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -429,22 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -476,22 +380,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -523,22 +411,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -570,22 +442,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -617,22 +473,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -666,22 +506,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -713,22 +537,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -760,22 +568,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -807,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -856,22 +632,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -905,22 +665,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -949,22 +693,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -993,22 +721,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -1037,22 +749,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, @@ -1083,22 +779,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:de:e2:3f:ea:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:de:e2:3f:ea", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-muvkrjr5-ts0601.json b/tests/data/devices/tze204-muvkrjr5-ts0601.json index 26e3acd09..ddf11abee 100644 --- a/tests/data/devices/tze204-muvkrjr5-ts0601.json +++ b/tests/data/devices/tze204-muvkrjr5-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d6:86:58:4b", "nwk": "0xB905", "manufacturer": "_TZE204_muvkrjr5", @@ -176,22 +176,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:d6:86:58:4b:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:d6:86:58:4b", "endpoint_id": 1, "available": true, @@ -219,22 +203,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d6:86:58:4b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:86:58:4b", "endpoint_id": 1, "available": true, @@ -264,22 +232,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d6:86:58:4b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:86:58:4b", "endpoint_id": 1, "available": true, @@ -311,22 +263,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d6:86:58:4b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:86:58:4b", "endpoint_id": 1, "available": true, @@ -358,22 +294,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d6:86:58:4b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:86:58:4b", "endpoint_id": 1, "available": true, @@ -407,22 +327,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d6:86:58:4b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:86:58:4b", "endpoint_id": 1, "available": true, @@ -451,22 +355,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d6:86:58:4b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:86:58:4b", "endpoint_id": 1, "available": true, @@ -495,22 +383,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:d6:86:58:4b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:86:58:4b", "endpoint_id": 1, "available": true, @@ -541,22 +413,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d6:86:58:4b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:86:58:4b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-mwomyz5n-ts0601.json b/tests/data/devices/tze204-mwomyz5n-ts0601.json index 55b2a95a3..3b8d94e9d 100644 --- a/tests/data/devices/tze204-mwomyz5n-ts0601.json +++ b/tests/data/devices/tze204-mwomyz5n-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a2:f0:cd:10", "nwk": "0xE2FD", "manufacturer": "_TZE204_mwomyz5n", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:f0:cd:10:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:f0:cd:10", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:f0:cd:10:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:f0:cd:10", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a2:f0:cd:10:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:f0:cd:10", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-nbkshs6k-ts0601.json b/tests/data/devices/tze204-nbkshs6k-ts0601.json index e5c75c514..5ab260307 100644 --- a/tests/data/devices/tze204-nbkshs6k-ts0601.json +++ b/tests/data/devices/tze204-nbkshs6k-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:05:55:11:88", "nwk": "0xA139", "manufacturer": "_TZE204_nbkshs6k", @@ -171,22 +171,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:05:55:11:88:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:55:11:88", "endpoint_id": 1, "available": true, @@ -215,22 +199,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:05:55:11:88:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:55:11:88", "endpoint_id": 1, "available": true, @@ -261,22 +229,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:05:55:11:88:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:05:55:11:88", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-nklqjk62-ts0601.json b/tests/data/devices/tze204-nklqjk62-ts0601.json index 4d94569e7..1d7cc49ea 100644 --- a/tests/data/devices/tze204-nklqjk62-ts0601.json +++ b/tests/data/devices/tze204-nklqjk62-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:49:b7:13:b6", "nwk": "0xACEF", "manufacturer": "_TZE204_nklqjk62", @@ -165,22 +165,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:49:b7:13:b6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:49:b7:13:b6", "endpoint_id": 1, "available": true, @@ -209,22 +193,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:49:b7:13:b6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:49:b7:13:b6", "endpoint_id": 1, "available": true, @@ -255,22 +223,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:49:b7:13:b6:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:49:b7:13:b6", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-nlrfgpny-ts0601.json b/tests/data/devices/tze204-nlrfgpny-ts0601.json index 48bf9e523..571988a01 100644 --- a/tests/data/devices/tze204-nlrfgpny-ts0601.json +++ b/tests/data/devices/tze204-nlrfgpny-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:fa:46:b7:f3", "nwk": "0x4E7D", "manufacturer": "_TZE204_nlrfgpny", @@ -249,22 +249,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -292,22 +276,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -337,22 +305,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -386,22 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -435,22 +371,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -485,22 +405,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -529,22 +433,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -573,22 +461,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -624,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -670,22 +526,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -712,22 +552,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -760,22 +584,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, @@ -810,22 +618,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:fa:46:b7:f3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fa:46:b7:f3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-nqqylykc-ts0601.json b/tests/data/devices/tze204-nqqylykc-ts0601.json index f54ef8dfb..0ecd41a38 100644 --- a/tests/data/devices/tze204-nqqylykc-ts0601.json +++ b/tests/data/devices/tze204-nqqylykc-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:11:27:8d:66", "nwk": "0x9574", "manufacturer": "_TZE204_nqqylykc", @@ -200,36 +200,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:11:27:8d:66:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:11:27:8d:66:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:11:27:8d:66", "endpoint_id": 1, "available": true, @@ -283,22 +253,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:11:27:8d:66:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:11:27:8d:66", "endpoint_id": 1, "available": true, @@ -327,22 +281,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:11:27:8d:66:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:11:27:8d:66", "endpoint_id": 1, "available": true, @@ -373,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:11:27:8d:66:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:11:27:8d:66", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-nvxorhcj-ts0601.json b/tests/data/devices/tze204-nvxorhcj-ts0601.json index 3d3aeb060..cca4481cd 100644 --- a/tests/data/devices/tze204-nvxorhcj-ts0601.json +++ b/tests/data/devices/tze204-nvxorhcj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:86:22:d1:17", "nwk": "0x8960", "manufacturer": "_TZE204_nvxorhcj", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:86:22:d1:17:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:86:22:d1:17", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:86:22:d1:17:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:86:22:d1:17", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:86:22:d1:17:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:86:22:d1:17", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-ogx8u5z6-ts0601.json b/tests/data/devices/tze204-ogx8u5z6-ts0601.json index e0fa4be7c..bb2d0cc39 100644 --- a/tests/data/devices/tze204-ogx8u5z6-ts0601.json +++ b/tests/data/devices/tze204-ogx8u5z6-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:0a:e8:8b:9f", "nwk": "0x36A6", "manufacturer": "_TZE204_ogx8u5z6", @@ -215,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:0a:e8:8b:9f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0a:e8:8b:9f", "endpoint_id": 1, "available": true, @@ -260,22 +244,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:0a:e8:8b:9f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:0a:e8:8b:9f", "endpoint_id": 1, "available": true, @@ -339,22 +307,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:0a:e8:8b:9f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0a:e8:8b:9f", "endpoint_id": 1, "available": true, @@ -388,22 +340,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0a:e8:8b:9f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0a:e8:8b:9f", "endpoint_id": 1, "available": true, @@ -432,22 +368,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0a:e8:8b:9f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0a:e8:8b:9f", "endpoint_id": 1, "available": true, @@ -476,22 +396,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:0a:e8:8b:9f:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:0a:e8:8b:9f", "endpoint_id": 1, "available": true, @@ -522,22 +426,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:0a:e8:8b:9f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0a:e8:8b:9f", "endpoint_id": 1, "available": true, @@ -570,22 +458,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:0a:e8:8b:9f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0a:e8:8b:9f", "endpoint_id": 1, "available": true, @@ -618,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:0a:e8:8b:9f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0a:e8:8b:9f", "endpoint_id": 1, "available": true, @@ -668,22 +524,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:0a:e8:8b:9f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0a:e8:8b:9f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-p3lqqy2r-ts0601.json b/tests/data/devices/tze204-p3lqqy2r-ts0601.json index 02c09b121..d694f3d67 100644 --- a/tests/data/devices/tze204-p3lqqy2r-ts0601.json +++ b/tests/data/devices/tze204-p3lqqy2r-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a0:ed:73:76", "nwk": "0x7A7E", "manufacturer": "_TZE204_p3lqqy2r", @@ -196,22 +196,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -241,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -320,22 +288,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -367,22 +319,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -416,22 +352,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -464,22 +384,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -514,22 +418,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -562,22 +450,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -611,22 +483,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -655,22 +511,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -699,22 +539,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -743,22 +567,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -787,22 +595,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -831,22 +623,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -875,22 +651,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -919,22 +679,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -965,22 +709,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, @@ -1015,22 +743,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a0:ed:73:76:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a0:ed:73:76", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-pcdmj88b-ts0601.json b/tests/data/devices/tze204-pcdmj88b-ts0601.json index eb5279291..c0f08815d 100644 --- a/tests/data/devices/tze204-pcdmj88b-ts0601.json +++ b/tests/data/devices/tze204-pcdmj88b-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:9d:ba:f4:54", "nwk": "0xAA62", "manufacturer": "_TZE204_pcdmj88b", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9d:ba:f4:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:ba:f4:54", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9d:ba:f4:54:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:ba:f4:54", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:9d:ba:f4:54:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9d:ba:f4:54", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-ptaqh9tk-ts0601.json b/tests/data/devices/tze204-ptaqh9tk-ts0601.json index 000237757..6069bc809 100644 --- a/tests/data/devices/tze204-ptaqh9tk-ts0601.json +++ b/tests/data/devices/tze204-ptaqh9tk-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:dc:de:8e:6f", "nwk": "0xDFBB", "manufacturer": "_TZE204_ptaqh9tk", @@ -188,22 +188,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:dc:de:8e:6f:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:dc:de:8e:6f", "endpoint_id": 1, "available": true, @@ -256,22 +240,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:dc:de:8e:6f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:de:8e:6f", "endpoint_id": 1, "available": true, @@ -300,22 +268,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:dc:de:8e:6f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:de:8e:6f", "endpoint_id": 1, "available": true, @@ -346,22 +298,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:dc:de:8e:6f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:dc:de:8e:6f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-pxbjch8m-ts0601.json b/tests/data/devices/tze204-pxbjch8m-ts0601.json index 5339abf11..c6fbbceb9 100644 --- a/tests/data/devices/tze204-pxbjch8m-ts0601.json +++ b/tests/data/devices/tze204-pxbjch8m-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f5:71:53:6a", "nwk": "0xFDB9", "manufacturer": "_TZE204_pxbjch8m", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f5:71:53:6a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:71:53:6a", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f5:71:53:6a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:71:53:6a", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f5:71:53:6a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:71:53:6a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-qasjif9e-ts0601.json b/tests/data/devices/tze204-qasjif9e-ts0601.json index 8627a7b6f..dbcf19a4c 100644 --- a/tests/data/devices/tze204-qasjif9e-ts0601.json +++ b/tests/data/devices/tze204-qasjif9e-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:f8:a7:c0:f2:88", "nwk": "0x8BCC", "manufacturer": "_TZE204_qasjif9e", @@ -216,22 +216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "a4:c1:38:f8:a7:c0:f2:88:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "a4:c1:38:f8:a7:c0:f2:88", "endpoint_id": 1, "available": true, @@ -261,22 +245,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "a4:c1:38:f8:a7:c0:f2:88:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:f8:a7:c0:f2:88", "endpoint_id": 1, "available": true, @@ -308,22 +276,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "a4:c1:38:f8:a7:c0:f2:88:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:f8:a7:c0:f2:88", "endpoint_id": 1, "available": true, @@ -355,22 +307,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "a4:c1:38:f8:a7:c0:f2:88:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:f8:a7:c0:f2:88", "endpoint_id": 1, "available": true, @@ -402,22 +338,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "a4:c1:38:f8:a7:c0:f2:88:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:f8:a7:c0:f2:88", "endpoint_id": 1, "available": true, @@ -449,22 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "a4:c1:38:f8:a7:c0:f2:88:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:f8:a7:c0:f2:88", "endpoint_id": 1, "available": true, @@ -498,22 +402,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:f8:a7:c0:f2:88:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:f8:a7:c0:f2:88", "endpoint_id": 1, "available": true, @@ -542,22 +430,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:f8:a7:c0:f2:88:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:f8:a7:c0:f2:88", "endpoint_id": 1, "available": true, @@ -586,22 +458,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "a4:c1:38:f8:a7:c0:f2:88:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:f8:a7:c0:f2:88", "endpoint_id": 1, "available": true, @@ -630,22 +486,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "a4:c1:38:f8:a7:c0:f2:88:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:f8:a7:c0:f2:88", "endpoint_id": 1, "available": true, @@ -676,22 +516,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "a4:c1:38:f8:a7:c0:f2:88:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:f8:a7:c0:f2:88", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-qtnjuoae-ts0601.json b/tests/data/devices/tze204-qtnjuoae-ts0601.json index 2d386d530..2f1f64504 100644 --- a/tests/data/devices/tze204-qtnjuoae-ts0601.json +++ b/tests/data/devices/tze204-qtnjuoae-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:65:78:bd:46", "nwk": "0xAEF2", "manufacturer": "_TZE204_qtnjuoae", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:65:78:bd:46:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:78:bd:46", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:65:78:bd:46:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:78:bd:46", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:65:78:bd:46:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:78:bd:46", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-qvxrkeif-ts0601.json b/tests/data/devices/tze204-qvxrkeif-ts0601.json index 2db41639e..2c5021e79 100644 --- a/tests/data/devices/tze204-qvxrkeif-ts0601.json +++ b/tests/data/devices/tze204-qvxrkeif-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:64:8d:3f:7f", "nwk": "0x83CF", "manufacturer": "_TZE204_qvxrkeif", @@ -189,22 +189,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:64:8d:3f:7f:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:64:8d:3f:7f", "endpoint_id": 1, "available": true, @@ -232,22 +216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:64:8d:3f:7f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:64:8d:3f:7f", "endpoint_id": 1, "available": true, @@ -275,22 +243,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:64:8d:3f:7f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:64:8d:3f:7f", "endpoint_id": 1, "available": true, @@ -318,22 +270,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:64:8d:3f:7f:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:64:8d:3f:7f", "endpoint_id": 1, "available": true, @@ -363,22 +299,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:64:8d:3f:7f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:64:8d:3f:7f", "endpoint_id": 1, "available": true, @@ -407,22 +327,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:64:8d:3f:7f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:64:8d:3f:7f", "endpoint_id": 1, "available": true, @@ -453,22 +357,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:64:8d:3f:7f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:64:8d:3f:7f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-qyr2m29i-ts0601.json b/tests/data/devices/tze204-qyr2m29i-ts0601.json index 83bbdede5..d2eeb8d86 100644 --- a/tests/data/devices/tze204-qyr2m29i-ts0601.json +++ b/tests/data/devices/tze204-qyr2m29i-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8c:9e:5f:db", "nwk": "0xAFEE", "manufacturer": "_TZE204_qyr2m29i", @@ -240,22 +240,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -285,22 +269,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -364,22 +332,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -411,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -458,22 +394,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -505,22 +425,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -552,22 +456,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -599,22 +487,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -648,22 +520,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -696,22 +552,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -743,22 +583,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -790,22 +614,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -838,22 +646,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -889,22 +681,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -933,22 +709,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -977,22 +737,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -1028,22 +772,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -1072,22 +800,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -1118,22 +830,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -1166,22 +862,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, @@ -1216,22 +896,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8c:9e:5f:db:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8c:9e:5f:db", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-r32ctezx-ts0601.json b/tests/data/devices/tze204-r32ctezx-ts0601.json index ae00c0546..80027a3aa 100644 --- a/tests/data/devices/tze204-r32ctezx-ts0601.json +++ b/tests/data/devices/tze204-r32ctezx-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:aa:3a:96:23", "nwk": "0xC0F2", "manufacturer": "_TZE204_r32ctezx", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:aa:3a:96:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:aa:3a:96:23", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:aa:3a:96:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:aa:3a:96:23", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:aa:3a:96:23:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:aa:3a:96:23", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-rhblgy0z-ts0601.json b/tests/data/devices/tze204-rhblgy0z-ts0601.json index 2cce92327..9b3dd7085 100644 --- a/tests/data/devices/tze204-rhblgy0z-ts0601.json +++ b/tests/data/devices/tze204-rhblgy0z-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:01:e4:99:90", "nwk": "0xE180", "manufacturer": "_TZE204_rhblgy0z", @@ -170,22 +170,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:01:e4:99:90:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:01:e4:99:90", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:01:e4:99:90:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:01:e4:99:90", "endpoint_id": 1, "available": true, @@ -260,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:01:e4:99:90:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:01:e4:99:90", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-rtrmfadk-ts0601.json b/tests/data/devices/tze204-rtrmfadk-ts0601.json index dbab4f9c4..5d3e77419 100644 --- a/tests/data/devices/tze204-rtrmfadk-ts0601.json +++ b/tests/data/devices/tze204-rtrmfadk-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:9f:cb:25:01", "nwk": "0x85FF", "manufacturer": "_TZE204_rtrmfadk", @@ -276,22 +276,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -319,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -364,22 +332,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -443,22 +395,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -490,22 +426,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -537,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -586,22 +490,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -635,22 +523,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -679,22 +551,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -723,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -774,22 +614,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -820,22 +644,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -868,22 +676,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, @@ -918,22 +710,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:9f:cb:25:01:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:9f:cb:25:01", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-sooucan5-ts0601.json b/tests/data/devices/tze204-sooucan5-ts0601.json index 2770a8ef9..6fcf91d52 100644 --- a/tests/data/devices/tze204-sooucan5-ts0601.json +++ b/tests/data/devices/tze204-sooucan5-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:32:23:3b:c2", "nwk": "0xC81B", "manufacturer": "_TZE204_sooucan5", @@ -189,22 +189,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, @@ -234,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, @@ -281,22 +249,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, @@ -328,22 +280,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, @@ -375,22 +311,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, @@ -424,22 +344,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, @@ -468,22 +372,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, @@ -512,22 +400,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, @@ -556,22 +428,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, @@ -600,22 +456,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, @@ -646,22 +486,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, @@ -696,22 +520,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:32:23:3b:c2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:32:23:3b:c2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-srmahpwl-ts0601.json b/tests/data/devices/tze204-srmahpwl-ts0601.json index dee964c24..394d50b0c 100644 --- a/tests/data/devices/tze204-srmahpwl-ts0601.json +++ b/tests/data/devices/tze204-srmahpwl-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:61:85:0a:53", "nwk": "0x9DC6", "manufacturer": "_TZE204_srmahpwl", @@ -170,22 +170,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:61:85:0a:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:61:85:0a:53", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:61:85:0a:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:61:85:0a:53", "endpoint_id": 1, "available": true, @@ -260,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:61:85:0a:53:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:61:85:0a:53", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-sxm7l9xa-ts0601.json b/tests/data/devices/tze204-sxm7l9xa-ts0601.json index 14680b255..c0cc76460 100644 --- a/tests/data/devices/tze204-sxm7l9xa-ts0601.json +++ b/tests/data/devices/tze204-sxm7l9xa-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:40:cd:6c:6c", "nwk": "0x9205", "manufacturer": "_TZE204_sxm7l9xa", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:40:cd:6c:6c:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:40:cd:6c:6c", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:40:cd:6c:6c:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cd:6c:6c", "endpoint_id": 1, "available": true, @@ -275,22 +243,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:40:cd:6c:6c:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cd:6c:6c", "endpoint_id": 1, "available": true, @@ -322,22 +274,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:40:cd:6c:6c:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cd:6c:6c", "endpoint_id": 1, "available": true, @@ -369,22 +305,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:40:cd:6c:6c:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cd:6c:6c", "endpoint_id": 1, "available": true, @@ -416,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:40:cd:6c:6c:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cd:6c:6c", "endpoint_id": 1, "available": true, @@ -465,22 +369,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:40:cd:6c:6c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cd:6c:6c", "endpoint_id": 1, "available": true, @@ -509,22 +397,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:40:cd:6c:6c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cd:6c:6c", "endpoint_id": 1, "available": true, @@ -553,22 +425,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:40:cd:6c:6c:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:40:cd:6c:6c", "endpoint_id": 1, "available": true, @@ -597,22 +453,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:40:cd:6c:6c:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cd:6c:6c", "endpoint_id": 1, "available": true, @@ -643,22 +483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:40:cd:6c:6c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:cd:6c:6c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-tagezcph-ts0601.json b/tests/data/devices/tze204-tagezcph-ts0601.json index c08ae6a94..983cd7530 100644 --- a/tests/data/devices/tze204-tagezcph-ts0601.json +++ b/tests/data/devices/tze204-tagezcph-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:49:f4:f9:87", "nwk": "0x21D2", "manufacturer": "_TZE204_tagezcph", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:49:f4:f9:87:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:49:f4:f9:87", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:49:f4:f9:87:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:49:f4:f9:87", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:49:f4:f9:87:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:49:f4:f9:87", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-tdhnhhiy-ts0601.json b/tests/data/devices/tze204-tdhnhhiy-ts0601.json index 476d6c51b..55e30ae2b 100644 --- a/tests/data/devices/tze204-tdhnhhiy-ts0601.json +++ b/tests/data/devices/tze204-tdhnhhiy-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:8b:bc:e1:ff", "nwk": "0x1F4A", "manufacturer": "_TZE204_tdhnhhiy", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8b:bc:e1:ff:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8b:bc:e1:ff", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:8b:bc:e1:ff:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8b:bc:e1:ff", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:8b:bc:e1:ff:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:8b:bc:e1:ff", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-ue3rzddr-ts0601.json b/tests/data/devices/tze204-ue3rzddr-ts0601.json index 1baa0404a..c2b6c2220 100644 --- a/tests/data/devices/tze204-ue3rzddr-ts0601.json +++ b/tests/data/devices/tze204-ue3rzddr-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cc:a0:21:17", "nwk": "0xDF2C", "manufacturer": "_TZE204_ue3rzddr", @@ -170,22 +170,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cc:a0:21:17:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cc:a0:21:17", "endpoint_id": 1, "available": true, @@ -214,22 +198,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cc:a0:21:17:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cc:a0:21:17", "endpoint_id": 1, "available": true, @@ -260,22 +228,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cc:a0:21:17:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cc:a0:21:17", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-upagmta9-ts0601.json b/tests/data/devices/tze204-upagmta9-ts0601.json index 8354825b6..25d97e53d 100644 --- a/tests/data/devices/tze204-upagmta9-ts0601.json +++ b/tests/data/devices/tze204-upagmta9-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a2:99:74:4c", "nwk": "0x833E", "manufacturer": "_TZE204_upagmta9", @@ -215,22 +215,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:a2:99:74:4c:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:99:74:4c", "endpoint_id": 1, "available": true, @@ -264,22 +248,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:99:74:4c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:99:74:4c", "endpoint_id": 1, "available": true, @@ -308,22 +276,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:99:74:4c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:99:74:4c", "endpoint_id": 1, "available": true, @@ -352,22 +304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:a2:99:74:4c:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:a2:99:74:4c", "endpoint_id": 1, "available": true, @@ -403,22 +339,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:a2:99:74:4c:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:a2:99:74:4c", "endpoint_id": 1, "available": true, @@ -447,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:a2:99:74:4c:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:a2:99:74:4c", "endpoint_id": 1, "available": true, @@ -493,22 +397,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a2:99:74:4c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:99:74:4c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-uxllnywp-ts0601.json b/tests/data/devices/tze204-uxllnywp-ts0601.json index f5a433449..b741ab08c 100644 --- a/tests/data/devices/tze204-uxllnywp-ts0601.json +++ b/tests/data/devices/tze204-uxllnywp-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6f:d4:0b:68", "nwk": "0x9FA1", "manufacturer": "_TZE204_uxllnywp", @@ -196,22 +196,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:6f:d4:0b:68:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:6f:d4:0b:68", "endpoint_id": 1, "available": true, @@ -241,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:6f:d4:0b:68:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:d4:0b:68", "endpoint_id": 1, "available": true, @@ -288,22 +256,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:6f:d4:0b:68:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:d4:0b:68", "endpoint_id": 1, "available": true, @@ -335,22 +287,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:6f:d4:0b:68:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:d4:0b:68", "endpoint_id": 1, "available": true, @@ -382,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:6f:d4:0b:68:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:d4:0b:68", "endpoint_id": 1, "available": true, @@ -431,22 +351,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6f:d4:0b:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:d4:0b:68", "endpoint_id": 1, "available": true, @@ -475,22 +379,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6f:d4:0b:68:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:d4:0b:68", "endpoint_id": 1, "available": true, @@ -519,22 +407,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:6f:d4:0b:68:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:6f:d4:0b:68", "endpoint_id": 1, "available": true, @@ -563,22 +435,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:6f:d4:0b:68:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:d4:0b:68", "endpoint_id": 1, "available": true, @@ -609,22 +465,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:6f:d4:0b:68:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:d4:0b:68", "endpoint_id": 1, "available": true, @@ -659,22 +499,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6f:d4:0b:68:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6f:d4:0b:68", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-vjpaih9f-ts0601.json b/tests/data/devices/tze204-vjpaih9f-ts0601.json index 8f79d0be4..e5df0a36d 100644 --- a/tests/data/devices/tze204-vjpaih9f-ts0601.json +++ b/tests/data/devices/tze204-vjpaih9f-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5c:57:ce:53", "nwk": "0x3A30", "manufacturer": "_TZE204_vjpaih9f", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5c:57:ce:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:57:ce:53", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5c:57:ce:53:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:57:ce:53", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5c:57:ce:53:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:57:ce:53", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-vmcgja59-ts0601.json b/tests/data/devices/tze204-vmcgja59-ts0601.json index dca1aecfa..8e11a0dc6 100644 --- a/tests/data/devices/tze204-vmcgja59-ts0601.json +++ b/tests/data/devices/tze204-vmcgja59-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:31:d2:60:17", "nwk": "0xA139", "manufacturer": "_TZE204_vmcgja59", @@ -608,22 +608,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:31:d2:60:17:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:31:d2:60:17", "endpoint_id": 1, "available": true, @@ -652,22 +636,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:31:d2:60:17:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:31:d2:60:17", "endpoint_id": 1, "available": true, @@ -698,22 +666,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:31:d2:60:17:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:31:d2:60:17", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-w1wwxoja-ts0601.json b/tests/data/devices/tze204-w1wwxoja-ts0601.json index 91f581708..eaeacce5a 100644 --- a/tests/data/devices/tze204-w1wwxoja-ts0601.json +++ b/tests/data/devices/tze204-w1wwxoja-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:b2:ef:fc:86", "nwk": "0xDCD7", "manufacturer": "_TZE204_w1wwxoja", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b2:ef:fc:86:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b2:ef:fc:86", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:b2:ef:fc:86:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b2:ef:fc:86", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:b2:ef:fc:86:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:b2:ef:fc:86", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-wbhaespm-ts0601.json b/tests/data/devices/tze204-wbhaespm-ts0601.json index 229c8f627..7405d098f 100644 --- a/tests/data/devices/tze204-wbhaespm-ts0601.json +++ b/tests/data/devices/tze204-wbhaespm-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4f:d5:67:94", "nwk": "0xB19C", "manufacturer": "_TZE204_wbhaespm", @@ -285,22 +285,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4f:d5:67:94:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:d5:67:94", "endpoint_id": 1, "available": true, @@ -329,22 +313,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4f:d5:67:94:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:d5:67:94", "endpoint_id": 1, "available": true, @@ -375,22 +343,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:4f:d5:67:94:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4f:d5:67:94", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-x8fp01wi-ts0601.json b/tests/data/devices/tze204-x8fp01wi-ts0601.json index 7fd029008..0431bf619 100644 --- a/tests/data/devices/tze204-x8fp01wi-ts0601.json +++ b/tests/data/devices/tze204-x8fp01wi-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ec:1f:25:23", "nwk": "0xBCEE", "manufacturer": "_TZE204_x8fp01wi", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ec:1f:25:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:1f:25:23", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ec:1f:25:23:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:1f:25:23", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ec:1f:25:23:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ec:1f:25:23", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-x9usygq1-ts0601.json b/tests/data/devices/tze204-x9usygq1-ts0601.json index 3da41fc22..35aebf266 100644 --- a/tests/data/devices/tze204-x9usygq1-ts0601.json +++ b/tests/data/devices/tze204-x9usygq1-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:92:c5:79:50", "nwk": "0xB1F9", "manufacturer": "_TZE204_x9usygq1", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:92:c5:79:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:92:c5:79:50", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:92:c5:79:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:92:c5:79:50", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:92:c5:79:50:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:92:c5:79:50", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-xalsoe3m-ts0601.json b/tests/data/devices/tze204-xalsoe3m-ts0601.json index 9ea733778..a8097cbab 100644 --- a/tests/data/devices/tze204-xalsoe3m-ts0601.json +++ b/tests/data/devices/tze204-xalsoe3m-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:19:d9:fb:05", "nwk": "0xF42C", "manufacturer": "_TZE204_xalsoe3m", @@ -546,22 +546,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 1, "available": true, @@ -625,22 +609,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 1, "available": true, @@ -672,22 +640,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 1, "available": true, @@ -719,22 +671,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 3, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "3:0x000d", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:3:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 3, "available": true, @@ -766,22 +702,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "AnalogOutputClusterHandler", - "generic_id": "cluster_handler_0x000d", - "endpoint_id": 4, - "cluster": { - "id": 13, - "name": "AnalogOutput", - "type": "server" - }, - "id": "4:0x000d", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:4:0x000d", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 4, "available": true, @@ -815,22 +735,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 1, "available": true, @@ -867,22 +771,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 1, "available": true, @@ -911,22 +799,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 1, "available": true, @@ -955,22 +827,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 1, "available": true, @@ -999,22 +855,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 1, "available": true, @@ -1045,22 +885,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 2, "available": true, @@ -1089,22 +913,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:19:d9:fb:05:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:19:d9:fb:05", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-xlppj4f5-ts0601.json b/tests/data/devices/tze204-xlppj4f5-ts0601.json index 05289a2aa..2695d9d09 100644 --- a/tests/data/devices/tze204-xlppj4f5-ts0601.json +++ b/tests/data/devices/tze204-xlppj4f5-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:fd:0b:2a:61", "nwk": "0x10B7", "manufacturer": "_TZE204_xlppj4f5", @@ -186,22 +186,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fd:0b:2a:61:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fd:0b:2a:61", "endpoint_id": 1, "available": true, @@ -230,22 +214,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:fd:0b:2a:61:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fd:0b:2a:61", "endpoint_id": 1, "available": true, @@ -274,22 +242,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:fd:0b:2a:61:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:fd:0b:2a:61", "endpoint_id": 1, "available": true, @@ -323,22 +275,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:fd:0b:2a:61:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:fd:0b:2a:61", "endpoint_id": 1, "available": true, @@ -373,22 +309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:fd:0b:2a:61:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:fd:0b:2a:61", "endpoint_id": 1, "available": true, @@ -425,22 +345,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:fd:0b:2a:61:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:fd:0b:2a:61", "endpoint_id": 1, "available": true, @@ -469,22 +373,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:fd:0b:2a:61:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:fd:0b:2a:61", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-xnbkhhdr-ts0601.json b/tests/data/devices/tze204-xnbkhhdr-ts0601.json index b085fe767..147fd7ac7 100644 --- a/tests/data/devices/tze204-xnbkhhdr-ts0601.json +++ b/tests/data/devices/tze204-xnbkhhdr-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:13:86:96:cf", "nwk": "0xDF46", "manufacturer": "_TZE204_xnbkhhdr", @@ -191,22 +191,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -236,22 +220,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -315,22 +283,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -362,22 +314,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -411,22 +347,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -460,22 +380,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -508,22 +412,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -556,22 +444,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -607,22 +479,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -651,22 +507,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -695,22 +535,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -741,22 +565,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -789,22 +597,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -837,22 +629,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, @@ -887,22 +663,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:13:86:96:cf:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:86:96:cf", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-xu4a5rhj-ts0601.json b/tests/data/devices/tze204-xu4a5rhj-ts0601.json index 3780d736d..c133fc916 100644 --- a/tests/data/devices/tze204-xu4a5rhj-ts0601.json +++ b/tests/data/devices/tze204-xu4a5rhj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:95:4f:58:7f", "nwk": "0x38B5", "manufacturer": "_TZE204_xu4a5rhj", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:95:4f:58:7f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:95:4f:58:7f", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:95:4f:58:7f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:95:4f:58:7f", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:95:4f:58:7f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:95:4f:58:7f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-ya4ft0w4-ts0601.json b/tests/data/devices/tze204-ya4ft0w4-ts0601.json index 69c922c73..ab2f8522e 100644 --- a/tests/data/devices/tze204-ya4ft0w4-ts0601.json +++ b/tests/data/devices/tze204-ya4ft0w4-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:eb:7f:3e:96", "nwk": "0x3B9E", "manufacturer": "_TZE204_ya4ft0w4", @@ -196,22 +196,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, @@ -241,22 +225,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, @@ -288,22 +256,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, @@ -335,22 +287,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, @@ -382,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, @@ -429,22 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, @@ -478,22 +382,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, @@ -522,22 +410,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, @@ -566,22 +438,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, @@ -610,22 +466,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, @@ -656,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, @@ -706,22 +530,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:eb:7f:3e:96:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:eb:7f:3e:96", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-yjjdcqsq-ts0601.json b/tests/data/devices/tze204-yjjdcqsq-ts0601.json index b316e7714..ffc870bc7 100644 --- a/tests/data/devices/tze204-yjjdcqsq-ts0601.json +++ b/tests/data/devices/tze204-yjjdcqsq-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:40:2d:94:5c", "nwk": "0xAD40", "manufacturer": "_TZE204_yjjdcqsq", @@ -211,22 +211,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:40:2d:94:5c:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:2d:94:5c", "endpoint_id": 1, "available": true, @@ -260,22 +244,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:40:2d:94:5c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:2d:94:5c", "endpoint_id": 1, "available": true, @@ -304,22 +272,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:40:2d:94:5c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:2d:94:5c", "endpoint_id": 1, "available": true, @@ -348,22 +300,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:40:2d:94:5c:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:40:2d:94:5c", "endpoint_id": 1, "available": true, @@ -399,22 +335,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:40:2d:94:5c:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:40:2d:94:5c", "endpoint_id": 1, "available": true, @@ -443,22 +363,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:40:2d:94:5c:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:40:2d:94:5c", "endpoint_id": 1, "available": true, @@ -489,22 +393,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:40:2d:94:5c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:40:2d:94:5c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-yvx5lh6k-ts0601.json b/tests/data/devices/tze204-yvx5lh6k-ts0601.json index 2b408c456..cd1535ff5 100644 --- a/tests/data/devices/tze204-yvx5lh6k-ts0601.json +++ b/tests/data/devices/tze204-yvx5lh6k-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:59:bb:bf:32", "nwk": "0x90F3", "manufacturer": "_TZE204_yvx5lh6k", @@ -213,22 +213,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:59:bb:bf:32:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:59:bb:bf:32", "endpoint_id": 1, "available": true, @@ -257,22 +241,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:59:bb:bf:32:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:59:bb:bf:32", "endpoint_id": 1, "available": true, @@ -301,22 +269,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:59:bb:bf:32:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:59:bb:bf:32", "endpoint_id": 1, "available": true, @@ -345,22 +297,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:59:bb:bf:32:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:59:bb:bf:32", "endpoint_id": 1, "available": true, @@ -389,22 +325,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "CarbonDioxideConcentrationClusterHandler", - "generic_id": "cluster_handler_0x040d", - "endpoint_id": 1, - "cluster": { - "id": 1037, - "name": "Carbon Dioxide (CO\u2082) Concentration", - "type": "server" - }, - "id": "1:0x040d", - "unique_id": "ab:cd:ef:12:59:bb:bf:32:1:0x040d", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:59:bb:bf:32", "endpoint_id": 1, "available": true, @@ -433,22 +353,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PM25ClusterHandler", - "generic_id": "cluster_handler_0x042a", - "endpoint_id": 1, - "cluster": { - "id": 1066, - "name": "PM2.5", - "type": "server" - }, - "id": "1:0x042a", - "unique_id": "ab:cd:ef:12:59:bb:bf:32:1:0x042a", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:59:bb:bf:32", "endpoint_id": 1, "available": true, @@ -477,22 +381,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "FormaldehydeConcentrationClusterHandler", - "generic_id": "cluster_handler_0x042b", - "endpoint_id": 1, - "cluster": { - "id": 1067, - "name": "Formaldehyde Concentration", - "type": "server" - }, - "id": "1:0x042b", - "unique_id": "ab:cd:ef:12:59:bb:bf:32:1:0x042b", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:59:bb:bf:32", "endpoint_id": 1, "available": true, @@ -521,22 +409,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0x042e", - "endpoint_id": 1, - "cluster": { - "id": 1070, - "name": "VOC Level", - "type": "server" - }, - "id": "1:0x042e", - "unique_id": "ab:cd:ef:12:59:bb:bf:32:1:0x042e", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:59:bb:bf:32", "endpoint_id": 1, "available": true, @@ -567,22 +439,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:59:bb:bf:32:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:59:bb:bf:32", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-zenj4lxv-ts0601.json b/tests/data/devices/tze204-zenj4lxv-ts0601.json index de2015837..9ae1fa22e 100644 --- a/tests/data/devices/tze204-zenj4lxv-ts0601.json +++ b/tests/data/devices/tze204-zenj4lxv-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:17:c8:fd:c8", "nwk": "0xBC08", "manufacturer": "_TZE204_zenj4lxv", @@ -226,36 +226,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:17:c8:fd:c8:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:17:c8:fd:c8:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:17:c8:fd:c8", "endpoint_id": 1, "available": true, @@ -307,36 +277,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 2, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "2:0x0006", - "unique_id": "ab:cd:ef:12:17:c8:fd:c8:2:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 2, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "2:0x0008", - "unique_id": "ab:cd:ef:12:17:c8:fd:c8:2:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:17:c8:fd:c8", "endpoint_id": 2, "available": true, @@ -390,22 +330,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:17:c8:fd:c8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:17:c8:fd:c8", "endpoint_id": 1, "available": true, @@ -434,22 +358,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:17:c8:fd:c8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:17:c8:fd:c8", "endpoint_id": 1, "available": true, @@ -480,22 +388,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:17:c8:fd:c8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:17:c8:fd:c8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-ztqnh5cg-ts0601.json b/tests/data/devices/tze204-ztqnh5cg-ts0601.json index 667bfe61b..dd2e00476 100644 --- a/tests/data/devices/tze204-ztqnh5cg-ts0601.json +++ b/tests/data/devices/tze204-ztqnh5cg-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e7:7d:1a:a0", "nwk": "0x67F5", "manufacturer": "_TZE204_ztqnh5cg", @@ -269,22 +269,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 1, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "1:0x0406", - "unique_id": "ab:cd:ef:12:e7:7d:1a:a0:1:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:e7:7d:1a:a0", "endpoint_id": 1, "available": true, @@ -314,22 +298,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e7:7d:1a:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7d:1a:a0", "endpoint_id": 1, "available": true, @@ -361,22 +329,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e7:7d:1a:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7d:1a:a0", "endpoint_id": 1, "available": true, @@ -408,22 +360,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e7:7d:1a:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7d:1a:a0", "endpoint_id": 1, "available": true, @@ -455,22 +391,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e7:7d:1a:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7d:1a:a0", "endpoint_id": 1, "available": true, @@ -502,22 +422,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e7:7d:1a:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7d:1a:a0", "endpoint_id": 1, "available": true, @@ -551,22 +455,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:7d:1a:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7d:1a:a0", "endpoint_id": 1, "available": true, @@ -595,22 +483,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:7d:1a:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7d:1a:a0", "endpoint_id": 1, "available": true, @@ -639,22 +511,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IlluminanceMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0400", - "endpoint_id": 1, - "cluster": { - "id": 1024, - "name": "Illuminance Measurement", - "type": "server" - }, - "id": "1:0x0400", - "unique_id": "ab:cd:ef:12:e7:7d:1a:a0:1:0x0400", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e7:7d:1a:a0", "endpoint_id": 1, "available": true, @@ -683,22 +539,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:e7:7d:1a:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7d:1a:a0", "endpoint_id": 1, "available": true, @@ -729,22 +569,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e7:7d:1a:a0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:7d:1a:a0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze204-zxkwaztm-ts0601.json b/tests/data/devices/tze204-zxkwaztm-ts0601.json index 73fb841f2..aa0485fc2 100644 --- a/tests/data/devices/tze204-zxkwaztm-ts0601.json +++ b/tests/data/devices/tze204-zxkwaztm-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:90:34:fa:13", "nwk": "0x75F7", "manufacturer": "_TZE204_zxkwaztm", @@ -208,22 +208,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:90:34:fa:13:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:90:34:fa:13", "endpoint_id": 1, "available": true, @@ -287,22 +271,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:90:34:fa:13:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:34:fa:13", "endpoint_id": 1, "available": true, @@ -331,22 +299,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:90:34:fa:13:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:34:fa:13", "endpoint_id": 1, "available": true, @@ -375,22 +327,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:90:34:fa:13:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:90:34:fa:13", "endpoint_id": 1, "available": true, @@ -421,22 +357,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:90:34:fa:13:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:90:34:fa:13", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze20c-xbexmf8h-ts130f.json b/tests/data/devices/tze20c-xbexmf8h-ts130f.json index a433ff467..a76f31be2 100644 --- a/tests/data/devices/tze20c-xbexmf8h-ts130f.json +++ b/tests/data/devices/tze20c-xbexmf8h-ts130f.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a2:5a:99:e9", "nwk": "0x87A1", "manufacturer": "_TZE20C_xbexmf8h", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:5a:99:e9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:5a:99:e9", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:5a:99:e9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:5a:99:e9", "endpoint_id": 1, "available": true, @@ -267,22 +235,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a2:5a:99:e9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:5a:99:e9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze20c-zka46xbw-ts0601.json b/tests/data/devices/tze20c-zka46xbw-ts0601.json index 208c91be1..120cc01d2 100644 --- a/tests/data/devices/tze20c-zka46xbw-ts0601.json +++ b/tests/data/devices/tze20c-zka46xbw-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:46:1c:4f:d5", "nwk": "0xE084", "manufacturer": "_TZE20C_zka46xbw", @@ -358,22 +358,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:46:1c:4f:d5:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:46:1c:4f:d5", "endpoint_id": 1, "available": true, @@ -403,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:46:1c:4f:d5:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:46:1c:4f:d5", "endpoint_id": 1, "available": true, @@ -451,22 +419,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:46:1c:4f:d5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:46:1c:4f:d5", "endpoint_id": 1, "available": true, @@ -495,22 +447,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:46:1c:4f:d5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:46:1c:4f:d5", "endpoint_id": 1, "available": true, @@ -541,22 +477,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:46:1c:4f:d5:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:46:1c:4f:d5", "endpoint_id": 1, "available": true, @@ -585,22 +505,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:46:1c:4f:d5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:46:1c:4f:d5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-0zaf1cr8-ts0601.json b/tests/data/devices/tze284-0zaf1cr8-ts0601.json index 9a20d8a72..4c70e87e0 100644 --- a/tests/data/devices/tze284-0zaf1cr8-ts0601.json +++ b/tests/data/devices/tze284-0zaf1cr8-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:98:e3:82:b6", "nwk": "0xCFFA", "manufacturer": "_TZE284_0zaf1cr8", @@ -185,22 +185,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:98:e3:82:b6:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:e3:82:b6", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:98:e3:82:b6:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:e3:82:b6", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:98:e3:82:b6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:e3:82:b6", "endpoint_id": 1, "available": true, @@ -317,22 +269,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:98:e3:82:b6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:e3:82:b6", "endpoint_id": 1, "available": true, @@ -361,22 +297,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:98:e3:82:b6:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:98:e3:82:b6", "endpoint_id": 1, "available": true, @@ -414,22 +334,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:98:e3:82:b6:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:98:e3:82:b6", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-2gi1hy8s-ts0601.json b/tests/data/devices/tze284-2gi1hy8s-ts0601.json index ad1144b53..7a1bb8e7f 100644 --- a/tests/data/devices/tze284-2gi1hy8s-ts0601.json +++ b/tests/data/devices/tze284-2gi1hy8s-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:19:ac:4b:2f", "nwk": "0x9FEF", "manufacturer": "_TZE284_2gi1hy8s", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:19:ac:4b:2f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:19:ac:4b:2f", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:19:ac:4b:2f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:19:ac:4b:2f", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:19:ac:4b:2f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:19:ac:4b:2f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-3mzb0sdz-ts0601.json b/tests/data/devices/tze284-3mzb0sdz-ts0601.json index 4d1ef5baa..5f4914ec9 100644 --- a/tests/data/devices/tze284-3mzb0sdz-ts0601.json +++ b/tests/data/devices/tze284-3mzb0sdz-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:70:52:10:a0", "nwk": "0xF696", "manufacturer": "_TZE284_3mzb0sdz", @@ -189,22 +189,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, @@ -232,22 +216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, @@ -275,22 +243,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, @@ -318,22 +270,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, @@ -361,22 +297,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, @@ -406,22 +326,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, @@ -456,22 +360,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, @@ -505,22 +393,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, @@ -549,22 +421,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, @@ -593,22 +449,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, @@ -644,22 +484,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, @@ -690,22 +514,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:70:52:10:a0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:70:52:10:a0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-6fopvb6v-ts0601.json b/tests/data/devices/tze284-6fopvb6v-ts0601.json index e5de31f1b..007bdad83 100644 --- a/tests/data/devices/tze284-6fopvb6v-ts0601.json +++ b/tests/data/devices/tze284-6fopvb6v-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c0:9e:79:27", "nwk": "0xD970", "manufacturer": "_TZE284_6fopvb6v", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c0:9e:79:27:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:9e:79:27", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c0:9e:79:27:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:9e:79:27", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c0:9e:79:27:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:9e:79:27", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-6hrnp30w-ts0601.json b/tests/data/devices/tze284-6hrnp30w-ts0601.json index 2496a726d..71f0f334a 100644 --- a/tests/data/devices/tze284-6hrnp30w-ts0601.json +++ b/tests/data/devices/tze284-6hrnp30w-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:61:38:1f:0e", "nwk": "0x55C2", "manufacturer": "_TZE284_6hrnp30w", @@ -421,22 +421,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:61:38:1f:0e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:61:38:1f:0e", "endpoint_id": 1, "available": true, @@ -465,22 +449,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:61:38:1f:0e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:61:38:1f:0e", "endpoint_id": 1, "available": true, @@ -511,22 +479,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:61:38:1f:0e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:61:38:1f:0e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-6ocnqlhn-ts0601.json b/tests/data/devices/tze284-6ocnqlhn-ts0601.json index c2f9fe5e7..9af788bd3 100644 --- a/tests/data/devices/tze284-6ocnqlhn-ts0601.json +++ b/tests/data/devices/tze284-6ocnqlhn-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7b:a7:f7:3b", "nwk": "0x9AE8", "manufacturer": "_TZE284_6ocnqlhn", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:a7:f7:3b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:a7:f7:3b", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:a7:f7:3b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:a7:f7:3b", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:7b:a7:f7:3b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:a7:f7:3b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-6ycgarab-ts0601.json b/tests/data/devices/tze284-6ycgarab-ts0601.json index 56eb3a059..5b3c15271 100644 --- a/tests/data/devices/tze284-6ycgarab-ts0601.json +++ b/tests/data/devices/tze284-6ycgarab-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f3:29:76:29", "nwk": "0x9289", "manufacturer": "_TZE284_6ycgarab", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f3:29:76:29:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f3:29:76:29", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f3:29:76:29:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f3:29:76:29", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f3:29:76:29:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f3:29:76:29", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-78ioiaml-ts0601.json b/tests/data/devices/tze284-78ioiaml-ts0601.json index ac144ff61..a0222652a 100644 --- a/tests/data/devices/tze284-78ioiaml-ts0601.json +++ b/tests/data/devices/tze284-78ioiaml-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:50:51:3e:41", "nwk": "0x96A0", "manufacturer": "_TZE284_78ioiaml", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:50:51:3e:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:50:51:3e:41", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:50:51:3e:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:50:51:3e:41", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:50:51:3e:41:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:50:51:3e:41", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-7gy9mqca-ts0601.json b/tests/data/devices/tze284-7gy9mqca-ts0601.json index 855180dc2..41c92dfd5 100644 --- a/tests/data/devices/tze284-7gy9mqca-ts0601.json +++ b/tests/data/devices/tze284-7gy9mqca-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:69:c5:23:07", "nwk": "0x3108", "manufacturer": "_TZE284_7gy9mqca", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:69:c5:23:07:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:69:c5:23:07", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:69:c5:23:07:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:69:c5:23:07", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:69:c5:23:07:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:69:c5:23:07", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-7zazvlyn-ts0601.json b/tests/data/devices/tze284-7zazvlyn-ts0601.json index e44b2e343..013328403 100644 --- a/tests/data/devices/tze284-7zazvlyn-ts0601.json +++ b/tests/data/devices/tze284-7zazvlyn-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:42:87:b0:e0", "nwk": "0x1A74", "manufacturer": "_TZE284_7zazvlyn", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:42:87:b0:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:42:87:b0:e0", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:42:87:b0:e0:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:42:87:b0:e0", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:42:87:b0:e0:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:42:87:b0:e0", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-81yrt3lo-ts0601.json b/tests/data/devices/tze284-81yrt3lo-ts0601.json index b575ef0b5..332ff50bc 100644 --- a/tests/data/devices/tze284-81yrt3lo-ts0601.json +++ b/tests/data/devices/tze284-81yrt3lo-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:71:30:aa:82", "nwk": "0x3102", "manufacturer": "_TZE284_81yrt3lo", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:71:30:aa:82:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:30:aa:82", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:71:30:aa:82:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:30:aa:82", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:71:30:aa:82:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:71:30:aa:82", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-8b9zpaav-ts0601.json b/tests/data/devices/tze284-8b9zpaav-ts0601.json index caa48da82..bc01a17e0 100644 --- a/tests/data/devices/tze284-8b9zpaav-ts0601.json +++ b/tests/data/devices/tze284-8b9zpaav-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5e:6b:1d:f1", "nwk": "0x266E", "manufacturer": "_TZE284_8b9zpaav", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:6b:1d:f1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:6b:1d:f1", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5e:6b:1d:f1:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:6b:1d:f1", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5e:6b:1d:f1:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5e:6b:1d:f1", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-8se38w3c-ts0601.json b/tests/data/devices/tze284-8se38w3c-ts0601.json index 47817cd6e..06e2af75b 100644 --- a/tests/data/devices/tze284-8se38w3c-ts0601.json +++ b/tests/data/devices/tze284-8se38w3c-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c3:0d:b8:1a", "nwk": "0x435A", "manufacturer": "_TZE284_8se38w3c", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c3:0d:b8:1a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:0d:b8:1a", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c3:0d:b8:1a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:0d:b8:1a", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c3:0d:b8:1a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c3:0d:b8:1a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-a2xewxoo-ts0601.json b/tests/data/devices/tze284-a2xewxoo-ts0601.json index 004ae3757..1a4baee11 100644 --- a/tests/data/devices/tze284-a2xewxoo-ts0601.json +++ b/tests/data/devices/tze284-a2xewxoo-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ee:07:7f:41", "nwk": "0x685B", "manufacturer": "_TZE284_a2xewxoo", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ee:07:7f:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ee:07:7f:41", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ee:07:7f:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ee:07:7f:41", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ee:07:7f:41:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ee:07:7f:41", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-aao3yzhs-ts0601.json b/tests/data/devices/tze284-aao3yzhs-ts0601.json index 6f188a632..564b41fcf 100644 --- a/tests/data/devices/tze284-aao3yzhs-ts0601.json +++ b/tests/data/devices/tze284-aao3yzhs-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:53:b5:37:5e", "nwk": "0x44FE", "manufacturer": "_TZE284_aao3yzhs", @@ -184,22 +184,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:53:b5:37:5e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:53:b5:37:5e", "endpoint_id": 1, "available": true, @@ -228,22 +212,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:53:b5:37:5e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:53:b5:37:5e", "endpoint_id": 1, "available": true, @@ -272,22 +240,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:53:b5:37:5e:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:53:b5:37:5e", "endpoint_id": 1, "available": true, @@ -323,22 +275,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:53:b5:37:5e:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:53:b5:37:5e", "endpoint_id": 1, "available": true, @@ -367,22 +303,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SoilMoistureClusterHandler", - "generic_id": "cluster_handler_0x0408", - "endpoint_id": 1, - "cluster": { - "id": 1032, - "name": "Soil Moisture Measurement", - "type": "server" - }, - "id": "1:0x0408", - "unique_id": "ab:cd:ef:12:53:b5:37:5e:1:0x0408", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:53:b5:37:5e", "endpoint_id": 1, "available": true, @@ -413,22 +333,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:53:b5:37:5e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:53:b5:37:5e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-c6wv4xyo-ts0601.json b/tests/data/devices/tze284-c6wv4xyo-ts0601.json index 48bc3143e..24c143414 100644 --- a/tests/data/devices/tze284-c6wv4xyo-ts0601.json +++ b/tests/data/devices/tze284-c6wv4xyo-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cf:73:e2:71", "nwk": "0x53E7", "manufacturer": "_TZE284_c6wv4xyo", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:cf:73:e2:71:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:73:e2:71", "endpoint_id": 1, "available": true, @@ -266,22 +250,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:cf:73:e2:71:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:cf:73:e2:71", "endpoint_id": 1, "available": true, @@ -345,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:cf:73:e2:71:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:73:e2:71", "endpoint_id": 1, "available": true, @@ -394,22 +346,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cf:73:e2:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:73:e2:71", "endpoint_id": 1, "available": true, @@ -438,22 +374,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cf:73:e2:71:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:73:e2:71", "endpoint_id": 1, "available": true, @@ -482,22 +402,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:cf:73:e2:71:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:cf:73:e2:71", "endpoint_id": 1, "available": true, @@ -528,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:cf:73:e2:71:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:73:e2:71", "endpoint_id": 1, "available": true, @@ -576,22 +464,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:cf:73:e2:71:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:73:e2:71", "endpoint_id": 1, "available": true, @@ -624,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:cf:73:e2:71:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:73:e2:71", "endpoint_id": 1, "available": true, @@ -674,22 +530,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cf:73:e2:71:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:73:e2:71", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-cjbofhxw-ts0601.json b/tests/data/devices/tze284-cjbofhxw-ts0601.json index 2ba8e58f9..9caae618e 100644 --- a/tests/data/devices/tze284-cjbofhxw-ts0601.json +++ b/tests/data/devices/tze284-cjbofhxw-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c7:6f:d7:98", "nwk": "0x5DE4", "manufacturer": "_TZE284_cjbofhxw", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c7:6f:d7:98:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c7:6f:d7:98", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c7:6f:d7:98:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c7:6f:d7:98", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c7:6f:d7:98:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c7:6f:d7:98", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-dikb3dp6-ts0601.json b/tests/data/devices/tze284-dikb3dp6-ts0601.json index bf4c9b8a4..3b038e14f 100644 --- a/tests/data/devices/tze284-dikb3dp6-ts0601.json +++ b/tests/data/devices/tze284-dikb3dp6-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:60:5a:a6:dd", "nwk": "0x8D30", "manufacturer": "_TZE284_dikb3dp6", @@ -425,22 +425,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -474,22 +458,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -518,22 +486,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -553,7 +505,7 @@ "unique_id": "ab:cd:ef:12:60:5a:a6:dd-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -562,22 +514,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -586,7 +522,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 144.0 }, @@ -610,22 +546,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -658,22 +578,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -706,22 +610,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -754,22 +642,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -801,22 +673,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -848,22 +704,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -895,22 +735,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -943,22 +767,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -991,22 +799,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1039,22 +831,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1087,22 +863,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1135,22 +895,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1183,22 +927,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1231,22 +959,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1275,22 +987,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1319,22 +1015,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1363,22 +1043,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1407,22 +1071,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1451,22 +1099,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1495,22 +1127,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1539,22 +1155,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1583,22 +1183,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, @@ -1629,22 +1213,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:60:5a:a6:dd:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:5a:a6:dd", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-dmckrsxg-ts0601.json b/tests/data/devices/tze284-dmckrsxg-ts0601.json index 826a10fcc..5cdfeb89d 100644 --- a/tests/data/devices/tze284-dmckrsxg-ts0601.json +++ b/tests/data/devices/tze284-dmckrsxg-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:2f:17:8f:32", "nwk": "0x1895", "manufacturer": "_TZE284_dmckrsxg", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2f:17:8f:32:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2f:17:8f:32", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:2f:17:8f:32:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2f:17:8f:32", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:2f:17:8f:32:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:2f:17:8f:32", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-f5efvtbv-ts0601.json b/tests/data/devices/tze284-f5efvtbv-ts0601.json index eaf8a2102..40c44cee4 100644 --- a/tests/data/devices/tze284-f5efvtbv-ts0601.json +++ b/tests/data/devices/tze284-f5efvtbv-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d6:b2:68:6b", "nwk": "0xB88F", "manufacturer": "_TZE284_f5efvtbv", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d6:b2:68:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:b2:68:6b", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d6:b2:68:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:b2:68:6b", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d6:b2:68:6b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d6:b2:68:6b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-fhvpaltk-ts0601.json b/tests/data/devices/tze284-fhvpaltk-ts0601.json index 22fcd3e04..b326665e9 100644 --- a/tests/data/devices/tze284-fhvpaltk-ts0601.json +++ b/tests/data/devices/tze284-fhvpaltk-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:56:b9:75:cd", "nwk": "0x179B", "manufacturer": "_TZE284_fhvpaltk", @@ -179,22 +179,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, @@ -226,22 +210,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, @@ -275,22 +243,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, @@ -319,22 +271,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, @@ -363,22 +299,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, @@ -414,22 +334,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, @@ -458,22 +362,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, @@ -502,22 +390,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, @@ -546,22 +418,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, @@ -592,22 +448,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, @@ -640,22 +480,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, @@ -690,22 +514,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:56:b9:75:cd:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:56:b9:75:cd", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-fzo2pocs-ts0601.json b/tests/data/devices/tze284-fzo2pocs-ts0601.json index 15ef2d802..4fa868740 100644 --- a/tests/data/devices/tze284-fzo2pocs-ts0601.json +++ b/tests/data/devices/tze284-fzo2pocs-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d4:9c:af:cd", "nwk": "0x19F3", "manufacturer": "_TZE284_fzo2pocs", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d4:9c:af:cd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:9c:af:cd", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d4:9c:af:cd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:9c:af:cd", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d4:9c:af:cd:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d4:9c:af:cd", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-g2e6cpnw-ts0601.json b/tests/data/devices/tze284-g2e6cpnw-ts0601.json index f57e07c93..196df9178 100644 --- a/tests/data/devices/tze284-g2e6cpnw-ts0601.json +++ b/tests/data/devices/tze284-g2e6cpnw-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:5c:ed:8a:ef", "nwk": "0xCD2B", "manufacturer": "_TZE284_g2e6cpnw", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5c:ed:8a:ef:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:ed:8a:ef", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:5c:ed:8a:ef:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:ed:8a:ef", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:5c:ed:8a:ef:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:5c:ed:8a:ef", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-hodyryli-ts0601.json b/tests/data/devices/tze284-hodyryli-ts0601.json index d24ff70cb..bfb2de1f7 100644 --- a/tests/data/devices/tze284-hodyryli-ts0601.json +++ b/tests/data/devices/tze284-hodyryli-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e6:20:71:50", "nwk": "0x3C22", "manufacturer": "_TZE284_hodyryli", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e6:20:71:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e6:20:71:50", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e6:20:71:50:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e6:20:71:50", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e6:20:71:50:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e6:20:71:50", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-iadro9bf-ts0601.json b/tests/data/devices/tze284-iadro9bf-ts0601.json index 0d8801b7e..188c5eb3a 100644 --- a/tests/data/devices/tze284-iadro9bf-ts0601.json +++ b/tests/data/devices/tze284-iadro9bf-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6b:c5:77:0a", "nwk": "0x3C41", "manufacturer": "_TZE284_iadro9bf", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6b:c5:77:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:c5:77:0a", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6b:c5:77:0a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:c5:77:0a", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6b:c5:77:0a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:c5:77:0a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-idvyees9-ts0601.json b/tests/data/devices/tze284-idvyees9-ts0601.json index ed1dadf99..1d9bae9a9 100644 --- a/tests/data/devices/tze284-idvyees9-ts0601.json +++ b/tests/data/devices/tze284-idvyees9-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a2:4b:d7:95", "nwk": "0x41E7", "manufacturer": "_TZE284_idvyees9", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:4b:d7:95:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:4b:d7:95", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a2:4b:d7:95:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:4b:d7:95", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a2:4b:d7:95:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a2:4b:d7:95", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-kyyu8rbj-ts0601.json b/tests/data/devices/tze284-kyyu8rbj-ts0601.json index 0dab1a243..023acd54e 100644 --- a/tests/data/devices/tze284-kyyu8rbj-ts0601.json +++ b/tests/data/devices/tze284-kyyu8rbj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:bf:44:a9:0b", "nwk": "0x41A3", "manufacturer": "_TZE284_kyyu8rbj", @@ -325,22 +325,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:bf:44:a9:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:44:a9:0b", "endpoint_id": 1, "available": true, @@ -372,22 +356,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:bf:44:a9:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:44:a9:0b", "endpoint_id": 1, "available": true, @@ -419,22 +387,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:bf:44:a9:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:44:a9:0b", "endpoint_id": 1, "available": true, @@ -466,22 +418,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:bf:44:a9:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:44:a9:0b", "endpoint_id": 1, "available": true, @@ -515,22 +451,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:bf:44:a9:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:44:a9:0b", "endpoint_id": 1, "available": true, @@ -565,22 +485,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bf:44:a9:0b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:44:a9:0b", "endpoint_id": 1, "available": true, @@ -609,22 +513,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bf:44:a9:0b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:44:a9:0b", "endpoint_id": 1, "available": true, @@ -653,22 +541,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:bf:44:a9:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:44:a9:0b", "endpoint_id": 1, "available": true, @@ -697,22 +569,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:bf:44:a9:0b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:44:a9:0b", "endpoint_id": 1, "available": true, @@ -743,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:bf:44:a9:0b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bf:44:a9:0b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-l8xiyymq-ts0601.json b/tests/data/devices/tze284-l8xiyymq-ts0601.json index 66b9c5385..a7e6479c8 100644 --- a/tests/data/devices/tze284-l8xiyymq-ts0601.json +++ b/tests/data/devices/tze284-l8xiyymq-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ff:0c:11:d3", "nwk": "0xEBB8", "manufacturer": "_TZE284_l8xiyymq", @@ -172,22 +172,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ff:0c:11:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ff:0c:11:d3", "endpoint_id": 1, "available": true, @@ -216,22 +200,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ff:0c:11:d3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ff:0c:11:d3", "endpoint_id": 1, "available": true, @@ -262,22 +230,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ff:0c:11:d3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ff:0c:11:d3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-lq0ffndf-ts0601.json b/tests/data/devices/tze284-lq0ffndf-ts0601.json index 067231f18..dac784bbf 100644 --- a/tests/data/devices/tze284-lq0ffndf-ts0601.json +++ b/tests/data/devices/tze284-lq0ffndf-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ba:cf:ff:9f", "nwk": "0x47E4", "manufacturer": "_TZE284_lq0ffndf", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ba:cf:ff:9f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:cf:ff:9f", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ba:cf:ff:9f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:cf:ff:9f", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:ba:cf:ff:9f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:cf:ff:9f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-ltwbm23f-ts0601.json b/tests/data/devices/tze284-ltwbm23f-ts0601.json index 5911c70a5..73729a6a5 100644 --- a/tests/data/devices/tze284-ltwbm23f-ts0601.json +++ b/tests/data/devices/tze284-ltwbm23f-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f0:2d:69:de", "nwk": "0x7395", "manufacturer": "_TZE284_ltwbm23f", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f0:2d:69:de:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:2d:69:de", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f0:2d:69:de:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:2d:69:de", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f0:2d:69:de:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f0:2d:69:de", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-myd45weu-ts0601.json b/tests/data/devices/tze284-myd45weu-ts0601.json index 7e8d565df..e2b0e35d9 100644 --- a/tests/data/devices/tze284-myd45weu-ts0601.json +++ b/tests/data/devices/tze284-myd45weu-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:59:b1:e9:9a", "nwk": "0x4D46", "manufacturer": "_TZE284_myd45weu", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:59:b1:e9:9a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:59:b1:e9:9a", "endpoint_id": 1, "available": true, @@ -265,22 +249,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:59:b1:e9:9a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:59:b1:e9:9a", "endpoint_id": 1, "available": true, @@ -309,22 +277,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:59:b1:e9:9a:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:59:b1:e9:9a", "endpoint_id": 1, "available": true, @@ -360,22 +312,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:59:b1:e9:9a:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:59:b1:e9:9a", "endpoint_id": 1, "available": true, @@ -404,22 +340,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SoilMoistureClusterHandler", - "generic_id": "cluster_handler_0x0408", - "endpoint_id": 1, - "cluster": { - "id": 1032, - "name": "Soil Moisture Measurement", - "type": "server" - }, - "id": "1:0x0408", - "unique_id": "ab:cd:ef:12:59:b1:e9:9a:1:0x0408", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:59:b1:e9:9a", "endpoint_id": 1, "available": true, @@ -450,22 +370,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:59:b1:e9:9a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:59:b1:e9:9a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-ne4pikwm-ts0601.json b/tests/data/devices/tze284-ne4pikwm-ts0601.json index daede2dff..3c8de2c88 100644 --- a/tests/data/devices/tze284-ne4pikwm-ts0601.json +++ b/tests/data/devices/tze284-ne4pikwm-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:06:a7:a1:e8", "nwk": "0x1CBC", "manufacturer": "_TZE284_ne4pikwm", @@ -293,22 +293,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -338,22 +322,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -417,22 +385,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -466,22 +418,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -510,22 +446,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -554,22 +474,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -600,22 +504,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -648,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -696,22 +568,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -744,22 +600,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -792,22 +632,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -840,22 +664,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, @@ -890,22 +698,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:06:a7:a1:e8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:06:a7:a1:e8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-nklqjk62-ts0601.json b/tests/data/devices/tze284-nklqjk62-ts0601.json index ee3f8cde0..f24071cf8 100644 --- a/tests/data/devices/tze284-nklqjk62-ts0601.json +++ b/tests/data/devices/tze284-nklqjk62-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:76:83:38:bb", "nwk": "0x2F7C", "manufacturer": "_TZE284_nklqjk62", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:76:83:38:bb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:76:83:38:bb", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:76:83:38:bb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:76:83:38:bb", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:76:83:38:bb:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:76:83:38:bb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-nnhwcvbk-ts0601.json b/tests/data/devices/tze284-nnhwcvbk-ts0601.json index f0391a436..0ea593d5f 100644 --- a/tests/data/devices/tze284-nnhwcvbk-ts0601.json +++ b/tests/data/devices/tze284-nnhwcvbk-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:15:ef:b2:34", "nwk": "0xBD12", "manufacturer": "_TZE284_nnhwcvbk", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:15:ef:b2:34:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:ef:b2:34", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:15:ef:b2:34:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:ef:b2:34", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:15:ef:b2:34:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:15:ef:b2:34", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-o3x45p96-ts0601.json b/tests/data/devices/tze284-o3x45p96-ts0601.json index 194b59b2f..173a8eae1 100644 --- a/tests/data/devices/tze284-o3x45p96-ts0601.json +++ b/tests/data/devices/tze284-o3x45p96-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:4e:95:64:6b", "nwk": "0x64FC", "manufacturer": "_TZE284_o3x45p96", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:4e:95:64:6b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:95:64:6b", "endpoint_id": 1, "available": true, @@ -266,22 +250,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:4e:95:64:6b:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:4e:95:64:6b", "endpoint_id": 1, "available": true, @@ -345,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:4e:95:64:6b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:95:64:6b", "endpoint_id": 1, "available": true, @@ -394,22 +346,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4e:95:64:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:95:64:6b", "endpoint_id": 1, "available": true, @@ -438,22 +374,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:4e:95:64:6b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:95:64:6b", "endpoint_id": 1, "available": true, @@ -482,22 +402,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:4e:95:64:6b:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:4e:95:64:6b", "endpoint_id": 1, "available": true, @@ -528,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:4e:95:64:6b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:95:64:6b", "endpoint_id": 1, "available": true, @@ -576,22 +464,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:4e:95:64:6b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:95:64:6b", "endpoint_id": 1, "available": true, @@ -624,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:4e:95:64:6b:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:95:64:6b", "endpoint_id": 1, "available": true, @@ -674,22 +530,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:4e:95:64:6b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:4e:95:64:6b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-o9ofysmo-ts0601.json b/tests/data/devices/tze284-o9ofysmo-ts0601.json index 7aa2ceaeb..d8e57f14e 100644 --- a/tests/data/devices/tze284-o9ofysmo-ts0601.json +++ b/tests/data/devices/tze284-o9ofysmo-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6b:ff:c5:80", "nwk": "0xD1F5", "manufacturer": "_TZE284_o9ofysmo", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6b:ff:c5:80:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:ff:c5:80", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6b:ff:c5:80:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:ff:c5:80", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6b:ff:c5:80:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6b:ff:c5:80", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-ogx8u5z6-ts0601.json b/tests/data/devices/tze284-ogx8u5z6-ts0601.json index dd3c96794..3297e750f 100644 --- a/tests/data/devices/tze284-ogx8u5z6-ts0601.json +++ b/tests/data/devices/tze284-ogx8u5z6-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c0:04:1b:41", "nwk": "0x5C98", "manufacturer": "_TZE284_ogx8u5z6", @@ -221,22 +221,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c0:04:1b:41:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:04:1b:41", "endpoint_id": 1, "available": true, @@ -266,22 +250,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c0:04:1b:41:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c0:04:1b:41", "endpoint_id": 1, "available": true, @@ -345,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c0:04:1b:41:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:04:1b:41", "endpoint_id": 1, "available": true, @@ -394,22 +346,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c0:04:1b:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:04:1b:41", "endpoint_id": 1, "available": true, @@ -438,22 +374,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c0:04:1b:41:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:04:1b:41", "endpoint_id": 1, "available": true, @@ -482,22 +402,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostatV2", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:c0:04:1b:41:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:c0:04:1b:41", "endpoint_id": 1, "available": true, @@ -528,22 +432,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c0:04:1b:41:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:04:1b:41", "endpoint_id": 1, "available": true, @@ -576,22 +464,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c0:04:1b:41:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:04:1b:41", "endpoint_id": 1, "available": true, @@ -624,22 +496,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:c0:04:1b:41:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:04:1b:41", "endpoint_id": 1, "available": true, @@ -674,22 +530,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c0:04:1b:41:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c0:04:1b:41", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-oitavov2-ts0601.json b/tests/data/devices/tze284-oitavov2-ts0601.json index 0cf71ea73..78ff13cff 100644 --- a/tests/data/devices/tze284-oitavov2-ts0601.json +++ b/tests/data/devices/tze284-oitavov2-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:62:26:55:a3", "nwk": "0xBE49", "manufacturer": "_TZE284_oitavov2", @@ -254,22 +254,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:62:26:55:a3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:62:26:55:a3", "endpoint_id": 1, "available": true, @@ -298,22 +282,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:62:26:55:a3:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:62:26:55:a3", "endpoint_id": 1, "available": true, @@ -342,22 +310,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:62:26:55:a3:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:62:26:55:a3", "endpoint_id": 1, "available": true, @@ -393,22 +345,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:62:26:55:a3:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:62:26:55:a3", "endpoint_id": 1, "available": true, @@ -437,22 +373,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SoilMoistureClusterHandler", - "generic_id": "cluster_handler_0x0408", - "endpoint_id": 1, - "cluster": { - "id": 1032, - "name": "Soil Moisture Measurement", - "type": "server" - }, - "id": "1:0x0408", - "unique_id": "ab:cd:ef:12:62:26:55:a3:1:0x0408", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:62:26:55:a3", "endpoint_id": 1, "available": true, @@ -483,22 +403,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:62:26:55:a3:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:62:26:55:a3", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-pcdmj88b-ts0601.json b/tests/data/devices/tze284-pcdmj88b-ts0601.json index fa656f810..c4e48ed91 100644 --- a/tests/data/devices/tze284-pcdmj88b-ts0601.json +++ b/tests/data/devices/tze284-pcdmj88b-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7b:62:e5:e2", "nwk": "0xEAE2", "manufacturer": "_TZE284_pcdmj88b", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:62:e5:e2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:62:e5:e2", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7b:62:e5:e2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:62:e5:e2", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:7b:62:e5:e2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7b:62:e5:e2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-qyflbnbj-ts0601.json b/tests/data/devices/tze284-qyflbnbj-ts0601.json index 12220ef22..85177b090 100644 --- a/tests/data/devices/tze284-qyflbnbj-ts0601.json +++ b/tests/data/devices/tze284-qyflbnbj-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:be:8d:9e:2b", "nwk": "0xD7CB", "manufacturer": "_TZE284_qyflbnbj", @@ -253,22 +253,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:be:8d:9e:2b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:8d:9e:2b", "endpoint_id": 1, "available": true, @@ -297,22 +281,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:be:8d:9e:2b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:8d:9e:2b", "endpoint_id": 1, "available": true, @@ -341,22 +309,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:be:8d:9e:2b:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:be:8d:9e:2b", "endpoint_id": 1, "available": true, @@ -392,22 +344,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:be:8d:9e:2b:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:be:8d:9e:2b", "endpoint_id": 1, "available": true, @@ -436,22 +372,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:be:8d:9e:2b:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:be:8d:9e:2b", "endpoint_id": 1, "available": true, @@ -482,22 +402,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:be:8d:9e:2b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:be:8d:9e:2b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-rjxqso4a-ts0601.json b/tests/data/devices/tze284-rjxqso4a-ts0601.json index a09614ff1..5e6e978d7 100644 --- a/tests/data/devices/tze284-rjxqso4a-ts0601.json +++ b/tests/data/devices/tze284-rjxqso4a-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:6a:91:4e:bb", "nwk": "0xDFB7", "manufacturer": "_TZE284_rjxqso4a", @@ -198,22 +198,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:6a:91:4e:bb:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:91:4e:bb", "endpoint_id": 1, "available": true, @@ -243,22 +227,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6a:91:4e:bb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:91:4e:bb", "endpoint_id": 1, "available": true, @@ -287,22 +255,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:6a:91:4e:bb:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:91:4e:bb", "endpoint_id": 1, "available": true, @@ -331,22 +283,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:6a:91:4e:bb:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:6a:91:4e:bb", "endpoint_id": 1, "available": true, @@ -382,22 +318,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:6a:91:4e:bb:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:91:4e:bb", "endpoint_id": 1, "available": true, @@ -426,22 +346,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:6a:91:4e:bb:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:91:4e:bb", "endpoint_id": 1, "available": true, @@ -472,22 +376,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:6a:91:4e:bb:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:91:4e:bb", "endpoint_id": 1, "available": true, @@ -522,22 +410,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:6a:91:4e:bb:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:6a:91:4e:bb", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-rlytpmij-ts0601.json b/tests/data/devices/tze284-rlytpmij-ts0601.json index 164479a10..efe5487cf 100644 --- a/tests/data/devices/tze284-rlytpmij-ts0601.json +++ b/tests/data/devices/tze284-rlytpmij-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:11:d8:40:d8", "nwk": "0x54C8", "manufacturer": "_TZE284_rlytpmij", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:11:d8:40:d8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:11:d8:40:d8", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:11:d8:40:d8:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:11:d8:40:d8", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:11:d8:40:d8:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:11:d8:40:d8", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-rqcuwlsa-ts0601.json b/tests/data/devices/tze284-rqcuwlsa-ts0601.json index 9bba0a8a8..04f4f22a0 100644 --- a/tests/data/devices/tze284-rqcuwlsa-ts0601.json +++ b/tests/data/devices/tze284-rqcuwlsa-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d2:7a:53:32", "nwk": "0x2151", "manufacturer": "_TZE284_rqcuwlsa", @@ -204,22 +204,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:7a:53:32:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:7a:53:32", "endpoint_id": 1, "available": true, @@ -248,22 +232,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:7a:53:32:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:7a:53:32", "endpoint_id": 1, "available": true, @@ -292,22 +260,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:d2:7a:53:32:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:d2:7a:53:32", "endpoint_id": 1, "available": true, @@ -343,22 +295,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:d2:7a:53:32:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d2:7a:53:32", "endpoint_id": 1, "available": true, @@ -387,22 +323,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SoilMoistureClusterHandler", - "generic_id": "cluster_handler_0x0408", - "endpoint_id": 1, - "cluster": { - "id": 1032, - "name": "Soil Moisture Measurement", - "type": "server" - }, - "id": "1:0x0408", - "unique_id": "ab:cd:ef:12:d2:7a:53:32:1:0x0408", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d2:7a:53:32", "endpoint_id": 1, "available": true, @@ -431,22 +351,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalConductivityClusterHandler", - "generic_id": "cluster_handler_0x040a", - "endpoint_id": 1, - "cluster": { - "id": 1034, - "name": "Electrical Conductivity", - "type": "server" - }, - "id": "1:0x040a", - "unique_id": "ab:cd:ef:12:d2:7a:53:32:1:0x040a", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:d2:7a:53:32", "endpoint_id": 1, "available": true, @@ -477,22 +381,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d2:7a:53:32:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:7a:53:32", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-rvnbnvw8-ts0601.json b/tests/data/devices/tze284-rvnbnvw8-ts0601.json index 820dc674f..2fcd85e57 100644 --- a/tests/data/devices/tze284-rvnbnvw8-ts0601.json +++ b/tests/data/devices/tze284-rvnbnvw8-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d2:00:45:a7", "nwk": "0x36BA", "manufacturer": "_TZE284_rvnbnvw8", @@ -183,22 +183,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:00:45:a7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:00:45:a7", "endpoint_id": 1, "available": true, @@ -227,22 +211,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d2:00:45:a7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:00:45:a7", "endpoint_id": 1, "available": true, @@ -273,22 +241,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:d2:00:45:a7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d2:00:45:a7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-sgabhwa6-ts0601.json b/tests/data/devices/tze284-sgabhwa6-ts0601.json index dd5ba5b95..76e62500e 100644 --- a/tests/data/devices/tze284-sgabhwa6-ts0601.json +++ b/tests/data/devices/tze284-sgabhwa6-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e7:63:0a:df", "nwk": "0xB658", "manufacturer": "_TZE284_sgabhwa6", @@ -338,22 +338,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:63:0a:df:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:63:0a:df", "endpoint_id": 1, "available": true, @@ -382,22 +366,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e7:63:0a:df:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:63:0a:df", "endpoint_id": 1, "available": true, @@ -426,22 +394,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:e7:63:0a:df:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:e7:63:0a:df", "endpoint_id": 1, "available": true, @@ -477,22 +429,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:e7:63:0a:df:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e7:63:0a:df", "endpoint_id": 1, "available": true, @@ -521,22 +457,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "SoilMoistureClusterHandler", - "generic_id": "cluster_handler_0x0408", - "endpoint_id": 1, - "cluster": { - "id": 1032, - "name": "Soil Moisture Measurement", - "type": "server" - }, - "id": "1:0x0408", - "unique_id": "ab:cd:ef:12:e7:63:0a:df:1:0x0408", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:e7:63:0a:df", "endpoint_id": 1, "available": true, @@ -567,22 +487,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e7:63:0a:df:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e7:63:0a:df", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-upagmta9-ts0601.json b/tests/data/devices/tze284-upagmta9-ts0601.json index 1be752223..179166e55 100644 --- a/tests/data/devices/tze284-upagmta9-ts0601.json +++ b/tests/data/devices/tze284-upagmta9-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:10:4c:9a:94", "nwk": "0x38F1", "manufacturer": "_TZE284_upagmta9", @@ -197,22 +197,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:10:4c:9a:94:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:10:4c:9a:94", "endpoint_id": 1, "available": true, @@ -246,22 +230,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:10:4c:9a:94:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:10:4c:9a:94", "endpoint_id": 1, "available": true, @@ -290,22 +258,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:10:4c:9a:94:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:10:4c:9a:94", "endpoint_id": 1, "available": true, @@ -334,22 +286,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:10:4c:9a:94:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:10:4c:9a:94", "endpoint_id": 1, "available": true, @@ -385,22 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:10:4c:9a:94:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:10:4c:9a:94", "endpoint_id": 1, "available": true, @@ -429,22 +349,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "ab:cd:ef:12:10:4c:9a:94:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:10:4c:9a:94", "endpoint_id": 1, "available": true, @@ -475,22 +379,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:10:4c:9a:94:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:10:4c:9a:94", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-vawy74yh-ts0601.json b/tests/data/devices/tze284-vawy74yh-ts0601.json index b2b6c651e..fcd8ed4b3 100644 --- a/tests/data/devices/tze284-vawy74yh-ts0601.json +++ b/tests/data/devices/tze284-vawy74yh-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:39:6f:28:8a", "nwk": "0x527A", "manufacturer": "_TZE284_vawy74yh", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:6f:28:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:28:8a", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:39:6f:28:8a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:28:8a", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:39:6f:28:8a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:39:6f:28:8a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-vuwtqx0t-ts0601.json b/tests/data/devices/tze284-vuwtqx0t-ts0601.json index a1b6bfa9b..9b37bdb61 100644 --- a/tests/data/devices/tze284-vuwtqx0t-ts0601.json +++ b/tests/data/devices/tze284-vuwtqx0t-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:f5:c9:76:a5", "nwk": "0xE5F5", "manufacturer": "_TZE284_vuwtqx0t", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f5:c9:76:a5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c9:76:a5", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:f5:c9:76:a5:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c9:76:a5", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:f5:c9:76:a5:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:f5:c9:76:a5", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-wtikaxzs-ts0601.json b/tests/data/devices/tze284-wtikaxzs-ts0601.json index a75e9079d..f72f5bcc5 100644 --- a/tests/data/devices/tze284-wtikaxzs-ts0601.json +++ b/tests/data/devices/tze284-wtikaxzs-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:13:75:cc:9f", "nwk": "0x1339", "manufacturer": "_TZE284_wtikaxzs", @@ -154,22 +154,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:13:75:cc:9f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:75:cc:9f", "endpoint_id": 1, "available": true, @@ -198,22 +182,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:13:75:cc:9f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:75:cc:9f", "endpoint_id": 1, "available": true, @@ -244,22 +212,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:13:75:cc:9f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:13:75:cc:9f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-xnbkhhdr-ts0601.json b/tests/data/devices/tze284-xnbkhhdr-ts0601.json index c7be75325..9a5b05630 100644 --- a/tests/data/devices/tze284-xnbkhhdr-ts0601.json +++ b/tests/data/devices/tze284-xnbkhhdr-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:60:04:48:19", "nwk": "0xF9D0", "manufacturer": "_TZE284_xnbkhhdr", @@ -275,22 +275,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -320,22 +304,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -399,22 +367,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -446,22 +398,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -493,22 +429,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -542,22 +462,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -591,22 +495,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -639,22 +527,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -687,22 +559,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -738,22 +594,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -782,22 +622,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -826,22 +650,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "TuyaThermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -872,22 +680,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -920,22 +712,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -968,22 +744,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TuyaClusterHandler", - "generic_id": "cluster_handler_0xef00", - "endpoint_id": 1, - "cluster": { - "id": 61184, - "name": "Tuya Manufacturer Specific", - "type": "server" - }, - "id": "1:0xef00", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0xef00", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, @@ -1018,22 +778,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:60:04:48:19:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:60:04:48:19", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-zjhoqbrd-ts0601.json b/tests/data/devices/tze284-zjhoqbrd-ts0601.json index 62b880caa..1abe85770 100644 --- a/tests/data/devices/tze284-zjhoqbrd-ts0601.json +++ b/tests/data/devices/tze284-zjhoqbrd-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cf:61:e4:86", "nwk": "0xCA2C", "manufacturer": "_TZE284_zjhoqbrd", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cf:61:e4:86:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:61:e4:86", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cf:61:e4:86:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:61:e4:86", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cf:61:e4:86:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cf:61:e4:86", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-zm8zpwas-ts0601.json b/tests/data/devices/tze284-zm8zpwas-ts0601.json index 1e703ae42..4a295b9ef 100644 --- a/tests/data/devices/tze284-zm8zpwas-ts0601.json +++ b/tests/data/devices/tze284-zm8zpwas-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:34:4b:0f:b2", "nwk": "0x10F0", "manufacturer": "_TZE284_zm8zpwas", @@ -166,22 +166,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:34:4b:0f:b2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:4b:0f:b2", "endpoint_id": 1, "available": true, @@ -210,22 +194,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:34:4b:0f:b2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:4b:0f:b2", "endpoint_id": 1, "available": true, @@ -256,22 +224,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:34:4b:0f:b2:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:34:4b:0f:b2", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-znvwzxkq-ts0601.json b/tests/data/devices/tze284-znvwzxkq-ts0601.json index 373934bae..e96366f3c 100644 --- a/tests/data/devices/tze284-znvwzxkq-ts0601.json +++ b/tests/data/devices/tze284-znvwzxkq-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:12:bb:1b:9d", "nwk": "0x2DC5", "manufacturer": "_TZE284_znvwzxkq", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:12:bb:1b:9d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:12:bb:1b:9d", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:12:bb:1b:9d:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:12:bb:1b:9d", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:12:bb:1b:9d:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:12:bb:1b:9d", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze284-zp8xakad-ts0601.json b/tests/data/devices/tze284-zp8xakad-ts0601.json index fed937a41..c0ae5bc52 100644 --- a/tests/data/devices/tze284-zp8xakad-ts0601.json +++ b/tests/data/devices/tze284-zp8xakad-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:cd:a4:d9:89", "nwk": "0x7EF7", "manufacturer": "_TZE284_zp8xakad", @@ -160,22 +160,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cd:a4:d9:89:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:a4:d9:89", "endpoint_id": 1, "available": true, @@ -204,22 +188,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:cd:a4:d9:89:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:a4:d9:89", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:cd:a4:d9:89:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:cd:a4:d9:89", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze28c1000000-alh14edn-ts0601.json b/tests/data/devices/tze28c1000000-alh14edn-ts0601.json index c62c97db2..49d2b914a 100644 --- a/tests/data/devices/tze28c1000000-alh14edn-ts0601.json +++ b/tests/data/devices/tze28c1000000-alh14edn-ts0601.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:a8:7c:51:4e", "nwk": "0x289C", "manufacturer": "_TZE28C1000000_alh14edn", @@ -197,22 +197,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:a8:7c:51:4e:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:7c:51:4e", "endpoint_id": 1, "available": true, @@ -245,22 +229,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a8:7c:51:4e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:7c:51:4e", "endpoint_id": 1, "available": true, @@ -289,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:a8:7c:51:4e:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:7c:51:4e", "endpoint_id": 1, "available": true, @@ -333,22 +285,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:a8:7c:51:4e:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:a8:7c:51:4e", "endpoint_id": 1, "available": true, @@ -385,22 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:a8:7c:51:4e:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:a8:7c:51:4e", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze600-iypcp4py-ts0105.json b/tests/data/devices/tze600-iypcp4py-ts0105.json index cf2c07f3e..2b51f4aee 100644 --- a/tests/data/devices/tze600-iypcp4py-ts0105.json +++ b/tests/data/devices/tze600-iypcp4py-ts0105.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e3:fb:03:e7", "nwk": "0xCBA9", "manufacturer": "_TZE600_iypcp4py", @@ -158,22 +158,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e3:fb:03:e7:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:fb:03:e7", "endpoint_id": 1, "available": true, @@ -206,22 +190,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e3:fb:03:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:fb:03:e7", "endpoint_id": 1, "available": true, @@ -250,22 +218,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e3:fb:03:e7:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:fb:03:e7", "endpoint_id": 1, "available": true, @@ -296,22 +248,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e3:fb:03:e7:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e3:fb:03:e7", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/tze608-c75zqghm-ts0603.json b/tests/data/devices/tze608-c75zqghm-ts0603.json index 1ea395b13..cc6b02f51 100644 --- a/tests/data/devices/tze608-c75zqghm-ts0603.json +++ b/tests/data/devices/tze608-c75zqghm-ts0603.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:38:20:4f:1a", "nwk": "0x27FF", "manufacturer": "_TZE608_c75zqghm", @@ -177,22 +177,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:38:20:4f:1a:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:20:4f:1a", "endpoint_id": 1, "available": true, @@ -225,22 +209,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:38:20:4f:1a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:20:4f:1a", "endpoint_id": 1, "available": true, @@ -269,22 +237,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:38:20:4f:1a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:20:4f:1a", "endpoint_id": 1, "available": true, @@ -315,22 +267,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:38:20:4f:1a:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:38:20:4f:1a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ubisys-j1-5502.json b/tests/data/devices/ubisys-j1-5502.json index 31de8e7fa..d100eaa36 100644 --- a/tests/data/devices/ubisys-j1-5502.json +++ b/tests/data/devices/ubisys-j1-5502.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:d1:f5:5f:ec", "nwk": "0x31A9", "manufacturer": "ubisys", @@ -184,22 +184,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:d1:f5:5f:ec:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:f5:5f:ec", "endpoint_id": 1, "available": true, @@ -232,22 +216,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:d1:f5:5f:ec:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:d1:f5:5f:ec", "endpoint_id": 1, "available": true, @@ -282,22 +250,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d1:f5:5f:ec:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:f5:5f:ec", "endpoint_id": 1, "available": true, @@ -326,22 +278,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:d1:f5:5f:ec:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:d1:f5:5f:ec", "endpoint_id": 1, "available": true, @@ -370,22 +306,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:d1:f5:5f:ec:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:d1:f5:5f:ec", "endpoint_id": 1, "available": true, @@ -416,22 +336,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:d1:f5:5f:ec:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:d1:f5:5f:ec", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/ubisys-s1-5501.json b/tests/data/devices/ubisys-s1-5501.json index 05e115196..d7ec8eb68 100644 --- a/tests/data/devices/ubisys-s1-5501.json +++ b/tests/data/devices/ubisys-s1-5501.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e4:d6:5c:c2", "nwk": "0x0DB4", "manufacturer": "ubisys", @@ -717,22 +717,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 1, "available": true, @@ -765,22 +749,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 1, "available": true, @@ -814,22 +782,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfbff", - "endpoint_id": 1, - "cluster": { - "id": 64511, - "name": "Ubisys Input Configuration", - "type": "server" - }, - "id": "1:0xfbff", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:1:0xfbff", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 1, "available": true, @@ -864,22 +816,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 1, "available": true, @@ -908,22 +844,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 1, "available": true, @@ -952,22 +872,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 3, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "3:0x0702", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:3:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 3, "available": true, @@ -994,7 +898,7 @@ "unique_id": "ab:cd:ef:12:e4:d6:5c:c2-3-1794-summation_delivered", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "ExposedFeaturePolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "translation_key": "summation_delivered", "translation_placeholders": null, "device_class": "energy", @@ -1003,22 +907,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 3, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "3:0x0702", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:3:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 3, "available": true, @@ -1027,7 +915,7 @@ "unit": "kWh" }, "state": { - "class_name": "ExposedFeaturePolledSmartEnergySummation", + "class_name": "SmartEnergySummation", "available": true, "state": 0.0, "status": "NO_ALARMS", @@ -1045,7 +933,7 @@ "unique_id": "ab:cd:ef:12:e4:d6:5c:c2-3-1794-summation_received", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "ExposedFeaturePolledSmartEnergySummationReceived", + "class_name": "SmartEnergySummationReceived", "translation_key": "summation_received", "translation_placeholders": null, "device_class": "energy", @@ -1054,22 +942,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 3, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "3:0x0702", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:3:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 3, "available": true, @@ -1078,7 +950,7 @@ "unit": "kWh" }, "state": { - "class_name": "ExposedFeaturePolledSmartEnergySummationReceived", + "class_name": "SmartEnergySummationReceived", "available": true, "state": 0.0, "status": "NO_ALARMS", @@ -1096,7 +968,7 @@ "unique_id": "ab:cd:ef:12:e4:d6:5c:c2-3-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "UbisysPolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -1105,22 +977,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 3, "available": true, @@ -1129,7 +985,7 @@ "unit": "W" }, "state": { - "class_name": "UbisysPolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 0.0, "measurement_type": "ACTIVE_MEASUREMENT, REACTIVE_MEASUREMENT, APPARENT_MEASUREMENT, PHASE_A_MEASUREMENT" @@ -1154,22 +1010,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 3, "available": true, @@ -1203,22 +1043,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 3, "available": true, @@ -1251,22 +1075,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 3, "available": true, @@ -1299,22 +1107,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 3, "available": true, @@ -1348,22 +1140,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 3, "available": true, @@ -1397,22 +1173,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 3, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "3:0x0b04", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:3:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 3, "available": true, @@ -1448,22 +1208,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 1, "available": true, @@ -1490,22 +1234,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ClusterHandler", - "generic_id": "cluster_handler_0xfbff", - "endpoint_id": 1, - "cluster": { - "id": 64511, - "name": "Ubisys Input Configuration", - "type": "server" - }, - "id": "1:0xfbff", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:1:0xfbff", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 1, "available": true, @@ -1540,22 +1268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 232, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "232:0x0019_client", - "unique_id": "ab:cd:ef:12:e4:d6:5c:c2:232:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e4:d6:5c:c2", "endpoint_id": 232, "available": true, diff --git a/tests/data/devices/uiot-uiot-windowcovring2-0402.json b/tests/data/devices/uiot-uiot-windowcovring2-0402.json index b2f8eaefe..90c73bf5e 100644 --- a/tests/data/devices/uiot-uiot-windowcovring2-0402.json +++ b/tests/data/devices/uiot-uiot-windowcovring2-0402.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c1:6d:31:24", "nwk": "0xD24F", "manufacturer": "UIOT", @@ -483,22 +483,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:c1:6d:31:24:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c1:6d:31:24", "endpoint_id": 1, "available": true, @@ -531,22 +515,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:c1:6d:31:24:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:c1:6d:31:24", "endpoint_id": 1, "available": true, @@ -579,22 +547,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 2, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "2:0x0102", - "unique_id": "ab:cd:ef:12:c1:6d:31:24:2:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:c1:6d:31:24", "endpoint_id": 2, "available": true, @@ -627,22 +579,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 3, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "3:0x0102", - "unique_id": "ab:cd:ef:12:c1:6d:31:24:3:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:c1:6d:31:24", "endpoint_id": 3, "available": true, @@ -677,22 +613,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c1:6d:31:24:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c1:6d:31:24", "endpoint_id": 1, "available": true, @@ -721,22 +641,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c1:6d:31:24:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c1:6d:31:24", "endpoint_id": 1, "available": true, @@ -765,22 +669,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "ab:cd:ef:12:c1:6d:31:24:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:c1:6d:31:24", "endpoint_id": 1, "available": true, @@ -809,22 +697,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 2, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "2:0x0102", - "unique_id": "ab:cd:ef:12:c1:6d:31:24:2:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:c1:6d:31:24", "endpoint_id": 2, "available": true, @@ -853,22 +725,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 3, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "3:0x0102", - "unique_id": "ab:cd:ef:12:c1:6d:31:24:3:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "ab:cd:ef:12:c1:6d:31:24", "endpoint_id": 3, "available": true, @@ -899,22 +755,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:c1:6d:31:24:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c1:6d:31:24", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/universal-electronics-inc-urc4460bc0-x-r.json b/tests/data/devices/universal-electronics-inc-urc4460bc0-x-r.json index 3fc82ccf4..91305d02e 100644 --- a/tests/data/devices/universal-electronics-inc-urc4460bc0-x-r.json +++ b/tests/data/devices/universal-electronics-inc-urc4460bc0-x-r.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:65:4f:d8:da", "nwk": "0x9980", "manufacturer": "Universal Electronics Inc", @@ -233,22 +233,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:65:4f:d8:da:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:4f:d8:da", "endpoint_id": 1, "available": true, @@ -278,22 +262,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:65:4f:d8:da:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:4f:d8:da", "endpoint_id": 1, "available": true, @@ -326,22 +294,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:65:4f:d8:da:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:4f:d8:da", "endpoint_id": 1, "available": true, @@ -370,22 +322,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:65:4f:d8:da:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:4f:d8:da", "endpoint_id": 1, "available": true, @@ -414,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:65:4f:d8:da:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:65:4f:d8:da", "endpoint_id": 1, "available": true, @@ -466,22 +386,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:65:4f:d8:da:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:65:4f:d8:da", "endpoint_id": 1, "available": true, @@ -512,22 +416,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:65:4f:d8:da:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:65:4f:d8:da", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/unk-manufacturer-unk-model.json b/tests/data/devices/unk-manufacturer-unk-model.json index ccb30b1b5..581722c86 100644 --- a/tests/data/devices/unk-manufacturer-unk-model.json +++ b/tests/data/devices/unk-manufacturer-unk-model.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:bb:85:b4:de", "nwk": "0xC94A", "manufacturer": "unk_manufacturer", @@ -289,22 +289,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:bb:85:b4:de:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:85:b4:de", "endpoint_id": 1, "available": true, @@ -337,50 +321,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:bb:85:b4:de:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:bb:85:b4:de:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ShadeClusterHandler", - "generic_id": "cluster_handler_0x0100", - "endpoint_id": 1, - "cluster": { - "id": 256, - "name": "Shade Configuration", - "type": "server" - }, - "id": "1:0x0100", - "unique_id": "ab:cd:ef:12:bb:85:b4:de:1:0x0100", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:85:b4:de", "endpoint_id": 1, "available": true, @@ -411,22 +351,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:bb:85:b4:de:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:bb:85:b4:de", "endpoint_id": 1, "available": true, @@ -460,22 +384,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bb:85:b4:de:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:85:b4:de", "endpoint_id": 1, "available": true, @@ -504,22 +412,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:bb:85:b4:de:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:bb:85:b4:de", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/visonic-mct-340-sma.json b/tests/data/devices/visonic-mct-340-sma.json index 7c2fc6ed6..29c07652e 100644 --- a/tests/data/devices/visonic-mct-340-sma.json +++ b/tests/data/devices/visonic-mct-340-sma.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:80:a4:c3:ba", "nwk": "0xFD81", "manufacturer": "Visonic", @@ -220,22 +220,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "IASZoneClusterHandler", - "generic_id": "cluster_handler_0x0500", - "endpoint_id": 1, - "cluster": { - "id": 1280, - "name": "IAS Zone", - "type": "server" - }, - "id": "1:0x0500", - "unique_id": "ab:cd:ef:12:80:a4:c3:ba:1:0x0500", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:80:a4:c3:ba", "endpoint_id": 1, "available": true, @@ -265,22 +249,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:80:a4:c3:ba:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:80:a4:c3:ba", "endpoint_id": 1, "available": true, @@ -313,22 +281,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:80:a4:c3:ba:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:80:a4:c3:ba", "endpoint_id": 1, "available": true, @@ -357,22 +309,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:80:a4:c3:ba:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:80:a4:c3:ba", "endpoint_id": 1, "available": true, @@ -401,22 +337,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:80:a4:c3:ba:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:80:a4:c3:ba", "endpoint_id": 1, "available": true, @@ -453,22 +373,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "ab:cd:ef:12:80:a4:c3:ba:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "ab:cd:ef:12:80:a4:c3:ba", "endpoint_id": 1, "available": true, @@ -499,22 +403,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:80:a4:c3:ba:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:80:a4:c3:ba", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/xiaomi-lywsd03mmc.json b/tests/data/devices/xiaomi-lywsd03mmc.json index ba459bf7b..2f260c899 100644 --- a/tests/data/devices/xiaomi-lywsd03mmc.json +++ b/tests/data/devices/xiaomi-lywsd03mmc.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "a4:c1:38:dd:ed:49:77:95", "nwk": "0xE280", "manufacturer": "Xiaomi", @@ -199,22 +199,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -247,22 +231,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -294,22 +262,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -341,22 +293,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -388,22 +324,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -435,22 +355,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -482,22 +386,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -531,22 +419,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -575,22 +447,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -619,22 +475,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -669,22 +509,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "TemperatureMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0402", - "endpoint_id": 1, - "cluster": { - "id": 1026, - "name": "Temperature Measurement", - "type": "server" - }, - "id": "1:0x0402", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0402", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -713,22 +537,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "RelativeHumidityClusterHandler", - "generic_id": "cluster_handler_0x0405", - "endpoint_id": 1, - "cluster": { - "id": 1029, - "name": "Relative Humidity Measurement", - "type": "server" - }, - "id": "1:0x0405", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0405", - "status": "INITIALIZED", - "value_attribute": "measured_value" - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -759,22 +567,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -807,22 +599,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, @@ -857,22 +633,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "a4:c1:38:dd:ed:49:77:95:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "a4:c1:38:dd:ed:49:77:95", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/xiaoyan-terncy-sd01.json b/tests/data/devices/xiaoyan-terncy-sd01.json index edfaca0cd..8af216d9c 100644 --- a/tests/data/devices/xiaoyan-terncy-sd01.json +++ b/tests/data/devices/xiaoyan-terncy-sd01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0d:6f:00:16:73:c1:c9", "nwk": "0x3165", "manufacturer": "Xiaoyan", @@ -173,22 +173,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0d:6f:00:16:73:c1:c9:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:16:73:c1:c9", "endpoint_id": 1, "available": true, @@ -221,22 +205,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:16:73:c1:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:16:73:c1:c9", "endpoint_id": 1, "available": true, @@ -265,22 +233,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:16:73:c1:c9:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:16:73:c1:c9", "endpoint_id": 1, "available": true, @@ -309,22 +261,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0d:6f:00:16:73:c1:c9:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0d:6f:00:16:73:c1:c9", "endpoint_id": 1, "available": true, @@ -360,22 +296,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0d:6f:00:16:73:c1:c9:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:16:73:c1:c9", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/xyzroe-diy-zintercom.json b/tests/data/devices/xyzroe-diy-zintercom.json index e72a19249..5d7bf4154 100644 --- a/tests/data/devices/xyzroe-diy-zintercom.json +++ b/tests/data/devices/xyzroe-diy-zintercom.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:0a:c9:43:1a", "nwk": "0x1927", "manufacturer": "xyzroe", @@ -136,22 +136,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:0a:c9:43:1a:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0a:c9:43:1a", "endpoint_id": 1, "available": true, @@ -181,22 +165,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0a:c9:43:1a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0a:c9:43:1a", "endpoint_id": 1, "available": true, @@ -225,22 +193,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:0a:c9:43:1a:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:0a:c9:43:1a", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/yale-yrd256-tsdb.json b/tests/data/devices/yale-yrd256-tsdb.json index a1d484237..d3b819b0a 100644 --- a/tests/data/devices/yale-yrd256-tsdb.json +++ b/tests/data/devices/yale-yrd256-tsdb.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "00:0d:6f:00:11:19:1f:7b", "nwk": "0x76B5", "manufacturer": "Yale", @@ -253,22 +253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "00:0d:6f:00:11:19:1f:7b:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:11:19:1f:7b", "endpoint_id": 1, "available": true, @@ -301,22 +285,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "DoorLockClusterHandler", - "generic_id": "cluster_handler_0x0101", - "endpoint_id": 1, - "cluster": { - "id": 257, - "name": "Door Lock", - "type": "server" - }, - "id": "1:0x0101", - "unique_id": "00:0d:6f:00:11:19:1f:7b:1:0x0101", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:11:19:1f:7b", "endpoint_id": 1, "available": true, @@ -345,22 +313,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:11:19:1f:7b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:11:19:1f:7b", "endpoint_id": 1, "available": true, @@ -389,22 +341,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "00:0d:6f:00:11:19:1f:7b:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:11:19:1f:7b", "endpoint_id": 1, "available": true, @@ -433,22 +369,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "00:0d:6f:00:11:19:1f:7b:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "00:0d:6f:00:11:19:1f:7b", "endpoint_id": 1, "available": true, @@ -487,22 +407,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "00:0d:6f:00:11:19:1f:7b:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "00:0d:6f:00:11:19:1f:7b", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/yooksmart-d10110.json b/tests/data/devices/yooksmart-d10110.json index a1dcb35c2..b5c021583 100644 --- a/tests/data/devices/yooksmart-d10110.json +++ b/tests/data/devices/yooksmart-d10110.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "6c:5c:b1:ff:fe:60:80:6f", "nwk": "0x547E", "manufacturer": "yooksmart", @@ -253,22 +253,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "6c:5c:b1:ff:fe:60:80:6f:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "6c:5c:b1:ff:fe:60:80:6f", "endpoint_id": 1, "available": true, @@ -301,22 +285,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "6c:5c:b1:ff:fe:60:80:6f:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "6c:5c:b1:ff:fe:60:80:6f", "endpoint_id": 1, "available": true, @@ -351,22 +319,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "6c:5c:b1:ff:fe:60:80:6f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "6c:5c:b1:ff:fe:60:80:6f", "endpoint_id": 1, "available": true, @@ -395,22 +347,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "6c:5c:b1:ff:fe:60:80:6f:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "6c:5c:b1:ff:fe:60:80:6f", "endpoint_id": 1, "available": true, @@ -439,22 +375,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "6c:5c:b1:ff:fe:60:80:6f:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "6c:5c:b1:ff:fe:60:80:6f", "endpoint_id": 1, "available": true, @@ -488,22 +408,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "6c:5c:b1:ff:fe:60:80:6f:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "6c:5c:b1:ff:fe:60:80:6f", "endpoint_id": 1, "available": true, @@ -534,22 +438,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "WindowCoveringClusterHandler", - "generic_id": "cluster_handler_0x0102", - "endpoint_id": 1, - "cluster": { - "id": 258, - "name": "Window Covering", - "type": "server" - }, - "id": "1:0x0102", - "unique_id": "6c:5c:b1:ff:fe:60:80:6f:1:0x0102", - "status": "INITIALIZED", - "value_attribute": "current_position_lift_percentage" - } - ], "device_ieee": "6c:5c:b1:ff:fe:60:80:6f", "endpoint_id": 1, "available": true, @@ -584,22 +472,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "6c:5c:b1:ff:fe:60:80:6f:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "6c:5c:b1:ff:fe:60:80:6f", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/yunding-ford.json b/tests/data/devices/yunding-ford.json index d441660e4..d11bd04e9 100644 --- a/tests/data/devices/yunding-ford.json +++ b/tests/data/devices/yunding-ford.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "68:0a:e2:ff:fe:6a:22:af", "nwk": "0x056B", "manufacturer": "Yunding", @@ -197,22 +197,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "68:0a:e2:ff:fe:6a:22:af:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:6a:22:af", "endpoint_id": 1, "available": true, @@ -245,22 +229,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "DoorLockClusterHandler", - "generic_id": "cluster_handler_0x0101", - "endpoint_id": 1, - "cluster": { - "id": 257, - "name": "Door Lock", - "type": "server" - }, - "id": "1:0x0101", - "unique_id": "68:0a:e2:ff:fe:6a:22:af:1:0x0101", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:6a:22:af", "endpoint_id": 1, "available": true, @@ -289,22 +257,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "68:0a:e2:ff:fe:6a:22:af:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:6a:22:af", "endpoint_id": 1, "available": true, @@ -333,22 +285,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "68:0a:e2:ff:fe:6a:22:af:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:6a:22:af", "endpoint_id": 1, "available": true, @@ -377,22 +313,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "68:0a:e2:ff:fe:6a:22:af:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "68:0a:e2:ff:fe:6a:22:af", "endpoint_id": 1, "available": true, @@ -430,22 +350,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "68:0a:e2:ff:fe:6a:22:af:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "68:0a:e2:ff:fe:6a:22:af", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/zbeacon-ts0001.json b/tests/data/devices/zbeacon-ts0001.json index 442c986fc..d71c4c778 100644 --- a/tests/data/devices/zbeacon-ts0001.json +++ b/tests/data/devices/zbeacon-ts0001.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:c6:20:7e:d6", "nwk": "0x2944", "manufacturer": "Zbeacon", @@ -194,22 +194,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:c6:20:7e:d6:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c6:20:7e:d6", "endpoint_id": 1, "available": true, @@ -242,22 +226,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:c6:20:7e:d6:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:c6:20:7e:d6", "endpoint_id": 1, "available": true, @@ -310,22 +278,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:c6:20:7e:d6:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:c6:20:7e:d6", "endpoint_id": 1, "available": true, @@ -361,22 +313,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c6:20:7e:d6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c6:20:7e:d6", "endpoint_id": 1, "available": true, @@ -405,22 +341,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:c6:20:7e:d6:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:c6:20:7e:d6", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/zbeacon-ts0505.json b/tests/data/devices/zbeacon-ts0505.json index 2e87fe6b1..77a5f7c99 100644 --- a/tests/data/devices/zbeacon-ts0505.json +++ b/tests/data/devices/zbeacon-ts0505.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:ba:80:83:70", "nwk": "0xE88F", "manufacturer": "zbeacon", @@ -310,22 +310,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -358,50 +342,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - }, - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - }, - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -460,22 +400,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ColorClusterHandler", - "generic_id": "cluster_handler_0x0300", - "endpoint_id": 1, - "cluster": { - "id": 768, - "name": "Color Control", - "type": "server" - }, - "id": "1:0x0300", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0300", - "status": "INITIALIZED", - "value_attribute": "current_x" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -507,22 +431,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -554,22 +462,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -601,22 +493,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -648,22 +524,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "LevelControlClusterHandler", - "generic_id": "cluster_handler_0x0008", - "endpoint_id": 1, - "cluster": { - "id": 8, - "name": "Level control", - "type": "server" - }, - "id": "1:0x0008", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0008", - "status": "INITIALIZED", - "value_attribute": "current_level" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -697,22 +557,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -748,22 +592,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -792,22 +620,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -836,22 +648,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -886,22 +682,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -927,7 +707,7 @@ "unique_id": "ab:cd:ef:12:ba:80:83:70-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -936,22 +716,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -960,7 +724,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": null }, @@ -984,22 +748,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -1032,22 +780,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -1079,22 +811,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -1126,22 +842,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, @@ -1174,22 +874,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:ba:80:83:70:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:ba:80:83:70", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/zehnder-group-vaux-andigny-alcantara2-d1-00p1-02z1-00.json b/tests/data/devices/zehnder-group-vaux-andigny-alcantara2-d1-00p1-02z1-00.json index 43f9c34a2..b8c2ca224 100644 --- a/tests/data/devices/zehnder-group-vaux-andigny-alcantara2-d1-00p1-02z1-00.json +++ b/tests/data/devices/zehnder-group-vaux-andigny-alcantara2-d1-00p1-02z1-00.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:7f:49:22:da", "nwk": "0xD3DA", "manufacturer": "ZEHNDER GROUP VAUX ANDIGNY ", @@ -385,22 +385,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OccupancySensingClusterHandler", - "generic_id": "cluster_handler_0x0406", - "endpoint_id": 2, - "cluster": { - "id": 1030, - "name": "Occupancy Sensing", - "type": "server" - }, - "id": "2:0x0406", - "unique_id": "ab:cd:ef:12:7f:49:22:da:2:0x0406", - "status": "INITIALIZED", - "value_attribute": "occupancy" - } - ], "device_ieee": "ab:cd:ef:12:7f:49:22:da", "endpoint_id": 2, "available": true, @@ -428,22 +412,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BinaryInputClusterHandler", - "generic_id": "cluster_handler_0x000f", - "endpoint_id": 3, - "cluster": { - "id": 15, - "name": "Binary Input (Basic)", - "type": "server" - }, - "id": "3:0x000f", - "unique_id": "ab:cd:ef:12:7f:49:22:da:3:0x000f", - "status": "INITIALIZED", - "value_attribute": "present_value" - } - ], "device_ieee": "ab:cd:ef:12:7f:49:22:da", "endpoint_id": 3, "available": true, @@ -473,22 +441,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:7f:49:22:da:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7f:49:22:da", "endpoint_id": 1, "available": true, @@ -521,22 +473,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7f:49:22:da:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7f:49:22:da", "endpoint_id": 1, "available": true, @@ -600,22 +536,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7f:49:22:da:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7f:49:22:da", "endpoint_id": 1, "available": true, @@ -649,22 +569,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7f:49:22:da:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7f:49:22:da", "endpoint_id": 1, "available": true, @@ -693,22 +597,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:7f:49:22:da:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:7f:49:22:da", "endpoint_id": 1, "available": true, @@ -737,22 +625,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7f:49:22:da:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7f:49:22:da", "endpoint_id": 1, "available": true, @@ -781,22 +653,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7f:49:22:da:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7f:49:22:da", "endpoint_id": 1, "available": true, @@ -825,22 +681,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:7f:49:22:da:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:7f:49:22:da", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/zemismart-spm02-3z3.json b/tests/data/devices/zemismart-spm02-3z3.json index 2bdcf0aa6..b8f5160be 100644 --- a/tests/data/devices/zemismart-spm02-3z3.json +++ b/tests/data/devices/zemismart-spm02-3z3.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:55:ac:22:4c", "nwk": "0xDE2C", "manufacturer": "Zemismart", @@ -601,22 +601,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OnOffClientClusterHandler", - "generic_id": "cluster_handler_0x0006_client", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "client" - }, - "id": "1:0x0006_client", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0006_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -646,22 +630,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -694,22 +662,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -738,22 +690,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -782,22 +718,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -834,22 +754,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "MeteringClusterHandler", - "generic_id": "cluster_handler_0x0702", - "endpoint_id": 1, - "cluster": { - "id": 1794, - "name": "Metering", - "type": "server" - }, - "id": "1:0x0702", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0702", - "status": "INITIALIZED", - "value_attribute": "instantaneous_demand" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -877,7 +781,7 @@ "unique_id": "ab:cd:ef:12:55:ac:22:4c-1-2820", "migrate_unique_ids": [], "platform": "sensor", - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "translation_key": null, "translation_placeholders": null, "device_class": "power", @@ -886,22 +790,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -910,7 +798,7 @@ "unit": "W" }, "state": { - "class_name": "PolledElectricalMeasurement", + "class_name": "ElectricalMeasurementActivePower", "available": true, "state": 3.0 }, @@ -934,22 +822,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -982,22 +854,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1030,22 +886,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1078,22 +918,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1125,22 +949,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1172,22 +980,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1219,22 +1011,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1266,22 +1042,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1314,22 +1074,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1362,22 +1106,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1410,22 +1138,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1458,22 +1170,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1506,22 +1202,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1554,22 +1234,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ElectricalMeasurementClusterHandler", - "generic_id": "cluster_handler_0x0b04", - "endpoint_id": 1, - "cluster": { - "id": 2820, - "name": "Electrical Measurement", - "type": "server" - }, - "id": "1:0x0b04", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0b04", - "status": "INITIALIZED", - "value_attribute": "ac_voltage_multiplier" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1604,22 +1268,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "OnOffClusterHandler", - "generic_id": "cluster_handler_0x0006", - "endpoint_id": 1, - "cluster": { - "id": 6, - "name": "On/Off", - "type": "server" - }, - "id": "1:0x0006", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0006", - "status": "INITIALIZED", - "value_attribute": "on_off" - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, @@ -1648,22 +1296,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:55:ac:22:4c:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:55:ac:22:4c", "endpoint_id": 1, "available": true, diff --git a/tests/data/devices/zen-within-zen-01.json b/tests/data/devices/zen-within-zen-01.json index 347a53076..58296d63a 100644 --- a/tests/data/devices/zen-within-zen-01.json +++ b/tests/data/devices/zen-within-zen-01.json @@ -1,5 +1,5 @@ { - "version": 1, + "version": 2, "ieee": "ab:cd:ef:12:e9:5a:2c:fd", "nwk": "0x93EA", "manufacturer": "Zen Within", @@ -375,22 +375,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "IdentifyClusterHandler", - "generic_id": "cluster_handler_0x0003", - "endpoint_id": 1, - "cluster": { - "id": 3, - "name": "Identify", - "type": "server" - }, - "id": "1:0x0003", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0003", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, @@ -423,36 +407,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": true, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - }, - { - "class_name": "FanClusterHandler", - "generic_id": "cluster_handler_0x0202", - "endpoint_id": 1, - "cluster": { - "id": 514, - "name": "Fan Control", - "type": "server" - }, - "id": "1:0x0202", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0202", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, @@ -521,22 +475,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, @@ -568,22 +506,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, @@ -615,22 +537,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, @@ -664,22 +570,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "UserInterfaceClusterHandler", - "generic_id": "cluster_handler_0x0204", - "endpoint_id": 1, - "cluster": { - "id": 516, - "name": "Thermostat User Interface Configuration", - "type": "server" - }, - "id": "1:0x0204", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0204", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, @@ -716,22 +606,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, @@ -760,22 +634,6 @@ "entity_registry_enabled_default": false, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "BasicClusterHandler", - "generic_id": "cluster_handler_0x0000", - "endpoint_id": 1, - "cluster": { - "id": 0, - "name": "Basic", - "type": "server" - }, - "id": "1:0x0000", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0000", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, @@ -804,22 +662,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "PowerConfigurationClusterHandler", - "generic_id": "cluster_handler_0x0001", - "endpoint_id": 1, - "cluster": { - "id": 1, - "name": "Power Configuration", - "type": "server" - }, - "id": "1:0x0001", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0001", - "status": "INITIALIZED", - "value_attribute": "battery_voltage" - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, @@ -856,22 +698,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, @@ -900,22 +726,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "ThermostatClusterHandler", - "generic_id": "cluster_handler_0x0201", - "endpoint_id": 1, - "cluster": { - "id": 513, - "name": "Thermostat", - "type": "server" - }, - "id": "1:0x0201", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0201", - "status": "INITIALIZED", - "value_attribute": "local_temperature" - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, @@ -946,22 +756,6 @@ "entity_registry_enabled_default": true, "enabled": true, "primary": false, - "cluster_handlers": [ - { - "class_name": "OtaClientClusterHandler", - "generic_id": "cluster_handler_0x0019_client", - "endpoint_id": 1, - "cluster": { - "id": 25, - "name": "Ota", - "type": "client" - }, - "id": "1:0x0019_client", - "unique_id": "ab:cd:ef:12:e9:5a:2c:fd:1:0x0019_CLIENT", - "status": "INITIALIZED", - "value_attribute": null - } - ], "device_ieee": "ab:cd:ef:12:e9:5a:2c:fd", "endpoint_id": 1, "available": true, diff --git a/tests/test_alarm_control_panel.py b/tests/test_alarm_control_panel.py index 0a7721050..4443ffc3c 100644 --- a/tests/test_alarm_control_panel.py +++ b/tests/test_alarm_control_panel.py @@ -215,7 +215,7 @@ async def test_alarm_control_panel( await reset_alarm_panel(zha_gateway, cluster, alarm_entity) assert alarm_entity.state["state"] == AlarmState.DISARMED - alarm_entity._cluster_handler.code_required_arm_actions = True + alarm_entity.code_required_arm_actions = True await alarm_entity.async_alarm_arm_away() await zha_gateway.async_block_till_done() assert alarm_entity.state["state"] == AlarmState.DISARMED diff --git a/tests/test_async_.py b/tests/test_async_.py index d049cec34..9407e6fc3 100644 --- a/tests/test_async_.py +++ b/tests/test_async_.py @@ -37,12 +37,18 @@ def run_job(job: ZHAJob) -> None: async def test_async_add_zha_job_schedule_callback() -> None: """Test that we schedule callbacks and add jobs to the job pool.""" - zha_gateway = MagicMock(loop=MagicMock(wraps=asyncio.get_running_loop())) + loop = asyncio.get_running_loop() + zha_gateway = MagicMock(loop=loop) job = MagicMock() - AsyncUtilMixin.async_add_zha_job(zha_gateway, ZHAJob(job)) - assert len(zha_gateway.loop.call_soon.mock_calls) == 1 - assert len(zha_gateway.loop.create_task.mock_calls) == 0 + with ( + patch.object(loop, "call_soon", wraps=loop.call_soon) as mock_call_soon, + patch.object(loop, "create_task", wraps=loop.create_task) as mock_create_task, + ): + AsyncUtilMixin.async_add_zha_job(zha_gateway, ZHAJob(job)) + + assert len(mock_call_soon.mock_calls) == 1 + assert len(mock_create_task.mock_calls) == 0 assert len(zha_gateway.add_job.mock_calls) == 0 @@ -177,32 +183,43 @@ async def mycoro(): async def test_async_add_zha_job_schedule_partial_callback() -> None: """Test that we schedule partial coros and add jobs to the job pool.""" - zha_gateway = MagicMock(loop=MagicMock(wraps=asyncio.get_running_loop())) + loop = asyncio.get_running_loop() + zha_gateway = MagicMock(loop=loop) job = MagicMock() partial = functools.partial(job) - AsyncUtilMixin.async_add_zha_job(zha_gateway, ZHAJob(partial)) - assert len(zha_gateway.loop.call_soon.mock_calls) == 1 - assert len(zha_gateway.loop.create_task.mock_calls) == 0 + with ( + patch.object(loop, "call_soon", wraps=loop.call_soon) as mock_call_soon, + patch.object(loop, "create_task", wraps=loop.create_task) as mock_create_task, + ): + AsyncUtilMixin.async_add_zha_job(zha_gateway, ZHAJob(partial)) + + assert len(mock_call_soon.mock_calls) == 1 + assert len(mock_create_task.mock_calls) == 0 assert len(zha_gateway.add_job.mock_calls) == 0 async def test_async_add_zha_job_schedule_coroutinefunction() -> None: """Test that we schedule coroutines and add jobs to the job pool.""" - zha_gateway = MagicMock(loop=MagicMock(wraps=asyncio.get_running_loop())) + loop = asyncio.get_running_loop() + zha_gateway = MagicMock(loop=loop) async def job(): pass - AsyncUtilMixin.async_add_zha_job(zha_gateway, ZHAJob(job)) - assert len(zha_gateway.loop.call_soon.mock_calls) == 0 - assert len(zha_gateway.loop.create_task.mock_calls) == 1 + with ( + patch.object(loop, "create_task", wraps=loop.create_task) as mock_create_task, + ): + AsyncUtilMixin.async_add_zha_job(zha_gateway, ZHAJob(job)) + + assert len(mock_create_task.mock_calls) == 1 assert len(zha_gateway.add_job.mock_calls) == 0 async def test_async_add_zha_job_schedule_corofunction_eager_start() -> None: """Test that we schedule coroutines and add jobs to the job pool.""" - zha_gateway = MagicMock(loop=(loop := asyncio.get_running_loop())) + loop = asyncio.get_running_loop() + zha_gateway = MagicMock(loop=loop) async def job(): pass @@ -215,27 +232,32 @@ async def job(): ): zha_job = ZHAJob(job) task = AsyncUtilMixin.async_add_zha_job(zha_gateway, zha_job, eager_start=True) - assert task is not None - assert mock_loop_call_soon.call_count == 0 - assert len(zha_gateway.add_job.mock_calls) == 0 - assert mock_create_eager_task.mock_calls - await task + + assert task is not None + assert mock_loop_call_soon.call_count == 0 + assert len(zha_gateway.add_job.mock_calls) == 0 + assert mock_create_eager_task.mock_calls + await task async def test_async_add_zha_job_schedule_partial_coroutinefunction( zha_gateway: Gateway, ) -> None: """Test that we schedule partial coros and add jobs to the job pool.""" - zha_gateway = MagicMock(loop=MagicMock(wraps=asyncio.get_running_loop())) + loop = asyncio.get_running_loop() + zha_gateway = MagicMock(loop=loop) async def job(): pass partial = functools.partial(job) - AsyncUtilMixin.async_add_zha_job(zha_gateway, ZHAJob(partial)) - assert len(zha_gateway.loop.call_soon.mock_calls) == 0 - assert len(zha_gateway.loop.create_task.mock_calls) == 1 + with ( + patch.object(loop, "create_task", wraps=loop.create_task) as mock_create_task, + ): + AsyncUtilMixin.async_add_zha_job(zha_gateway, ZHAJob(partial)) + + assert len(mock_create_task.mock_calls) == 1 assert len(zha_gateway.add_job.mock_calls) == 0 @@ -254,20 +276,25 @@ def job(): async def test_async_create_task_schedule_coroutine() -> None: """Test that we schedule coroutines and add jobs to the job pool.""" - zha_gateway = MagicMock(loop=MagicMock(wraps=asyncio.get_running_loop())) + loop = asyncio.get_running_loop() + zha_gateway = MagicMock(loop=loop) async def job(): pass - AsyncUtilMixin.async_create_task(zha_gateway, job()) - assert len(zha_gateway.loop.call_soon.mock_calls) == 0 - assert len(zha_gateway.loop.create_task.mock_calls) == 1 + with ( + patch.object(loop, "create_task", wraps=loop.create_task) as mock_create_task, + ): + AsyncUtilMixin.async_create_task(zha_gateway, job()) + + assert len(mock_create_task.mock_calls) == 1 assert len(zha_gateway.add_job.mock_calls) == 0 async def test_async_create_task_eager_start_schedule_coroutine() -> None: """Test that we schedule coroutines and add jobs to the job pool.""" - zha_gateway = MagicMock(loop=(loop := asyncio.get_running_loop())) + loop = asyncio.get_running_loop() + zha_gateway = MagicMock(loop=loop) async def job(): pass @@ -282,14 +309,18 @@ async def job(): async def test_async_create_task_schedule_coroutine_with_name() -> None: """Test that we schedule coroutines and add jobs to the job pool with a name.""" - zha_gateway = MagicMock(loop=MagicMock(wraps=asyncio.get_running_loop())) + loop = asyncio.get_running_loop() + zha_gateway = MagicMock(loop=loop) async def job(): pass - task = AsyncUtilMixin.async_create_task(zha_gateway, job(), "named task") - assert len(zha_gateway.loop.call_soon.mock_calls) == 0 - assert len(zha_gateway.loop.create_task.mock_calls) == 1 + with ( + patch.object(loop, "create_task", wraps=loop.create_task) as mock_create_task, + ): + task = AsyncUtilMixin.async_create_task(zha_gateway, job(), "named task") + + assert len(mock_create_task.mock_calls) == 1 assert len(zha_gateway.add_job.mock_calls) == 0 assert "named task" in str(task) diff --git a/tests/test_binary_sensor.py b/tests/test_binary_sensor.py index da42ad044..3f019c5e0 100644 --- a/tests/test_binary_sensor.py +++ b/tests/test_binary_sensor.py @@ -2,7 +2,8 @@ import asyncio from collections.abc import Awaitable, Callable -from unittest.mock import MagicMock, call +from typing import Any +from unittest.mock import call import pytest from zigpy.profiles import zha @@ -36,7 +37,7 @@ IASZone, Occupancy, ) -from zha.zigbee.cluster_handlers.const import SMARTTHINGS_ACCELERATION_CLUSTER +from zha.application.platforms.const import SMARTTHINGS_ACCELERATION_CLUSTER DEVICE_IAS = { 1: { @@ -108,7 +109,7 @@ async def async_test_binary_sensor_occupancy( await zha_gateway.async_block_till_done() assert cluster.read_attributes.await_count == 1 assert cluster.read_attributes.await_args == call( - ["occupancy"], allow_cache=True, only_cache=True, manufacturer=UNDEFINED + ["occupancy"], allow_cache=False, only_cache=False, manufacturer=UNDEFINED ) assert entity.is_on @@ -230,20 +231,28 @@ async def test_smarttthings_multi( assert entity.PLATFORM == Platform.BINARY_SENSOR assert entity.is_on is False - st_ch = zha_device.endpoints[1].all_cluster_handlers["1:0xfc02"] - assert st_ch is not None - - st_ch.emit_zha_event = MagicMock(wraps=st_ch.emit_zha_event) + # SmartThingsAccelerationEvent (virtual entity) re-emits attribute updates on + # the SmartThings acceleration cluster as zha_events on the device. + accel_cluster = zigpy_device.endpoints[1].in_clusters[ + SMARTTHINGS_ACCELERATION_CLUSTER + ] + events: list[Any] = [] + zha_device.on_event("zha_event", events.append) - await send_attributes_report(zha_gateway, st_ch.cluster, {"x_axis": 120}) + await send_attributes_report(zha_gateway, accel_cluster, {"x_axis": 120}) - assert st_ch.emit_zha_event.call_count == 1 - assert st_ch.emit_zha_event.mock_calls == [ - call( - "attribute_updated", - {"attribute_id": 18, "attribute_name": "x_axis", "attribute_value": 120}, - ) + zha_events = [ + e + for e in events + if e.data.get("command") == "attribute_updated" + and e.data.get("cluster_id") == SMARTTHINGS_ACCELERATION_CLUSTER ] + assert len(zha_events) == 1 + assert zha_events[0].data["args"] == { + "attribute_id": 18, + "attribute_name": "x_axis", + "attribute_value": 120, + } async def test_quirks_binary_sensor_attr_converter(zha_gateway: Gateway) -> None: diff --git a/tests/test_button.py b/tests/test_button.py index 2777631c4..0ec745c1a 100644 --- a/tests/test_button.py +++ b/tests/test_button.py @@ -36,7 +36,6 @@ update_attribute_cache, ) from zha.application import Platform -from zha.application.const import ZCL_INIT_ATTRS from zha.application.gateway import Gateway from zha.application.platforms import EntityCategory, PlatformEntity from zha.application.platforms.button import ( @@ -45,8 +44,6 @@ WriteAttributeButton, ) from zha.application.platforms.button.const import ButtonDeviceClass -from zha.exceptions import ZHAException -from zha.zigbee.cluster_handlers.manufacturerspecific import OppleRemoteClusterHandler from zha.zigbee.device import Device ZIGPY_DEVICE = { @@ -162,15 +159,12 @@ async def test_frost_unlock( cluster.write_attributes.reset_mock() cluster.write_attributes.side_effect = ZigbeeException - with pytest.raises(ZHAException): + with pytest.raises(ZigbeeException): await entity.async_press() await zha_gateway.async_block_till_done() - # There are three retries assert cluster.write_attributes.mock_calls == [ - call({"frost_lock_reset": 0}, manufacturer=UNDEFINED), - call({"frost_lock_reset": 0}, manufacturer=UNDEFINED), - call({"frost_lock_reset": 0}, manufacturer=UNDEFINED), + call({"frost_lock_reset": 0}, manufacturer=UNDEFINED) ] @@ -374,10 +368,10 @@ class ServerCommandDefs(zcl_f.BaseCommandDefs): ) -async def test_cluster_handler_quirks_unnecessary_claiming( +async def test_quirks_v2_button_only_cluster_is_not_configured( zha_gateway: Gateway, ) -> None: - """Test quirks button doesn't claim cluster handlers unnecessarily.""" + """A quirks v2 command button alone shouldn't trigger bind/reporting/reads.""" registry = DeviceRegistry() ( @@ -412,36 +406,26 @@ async def test_cluster_handler_quirks_unnecessary_claiming( model="Fake_Model_sensor_2", ) zigpy_device = registry.get_device(zigpy_device) - - # Suppress normal endpoint probing, as this will claim the Opple cluster handler - # already due to it being in the "CLUSTER_HANDLER_ONLY_CLUSTERS" registry. - # We want to test the handler also gets claimed via quirks v2 attributes init. + # `registry.get_device` swaps in the replaced OppleCluster instance; patch its + # network methods so we can assert bind/reporting/reading didn't happen. + opple_cluster = zigpy_device.endpoints[1].opple_cluster + patch_cluster_for_testing(opple_cluster) + + # Suppress normal endpoint probing, so virtual entities for the Opple cluster + # (e.g. AqaraOppleBind) don't trigger a bind themselves — we want to verify + # the quirks v2 button path alone does no cluster setup work. with patch("zha.application.discovery.discover_entities_for_endpoint"): zha_device = await join_zigpy_device(zha_gateway, zigpy_device) assert isinstance(zha_device.device, CustomDeviceV2) - # get cluster handler of OppleCluster - opple_ch = zha_device.endpoints[1].all_cluster_handlers["1:0xfcc0"] - assert isinstance(opple_ch, OppleRemoteClusterHandler) - - # make sure the cluster handler was not claimed, - # as no reporting is configured and no attributes are to be read - assert opple_ch not in zha_device.endpoints[1].claimed_cluster_handlers.values() - - # check that BIND is left at default of True, though ZHA will ignore it - assert opple_ch.BIND is True - - # check ZCL_INIT_ATTRS is empty - assert opple_ch.ZCL_INIT_ATTRS == {} - - # check that no ZCL_INIT_ATTRS instance variable was created - assert opple_ch.__dict__.get(ZCL_INIT_ATTRS) is None - assert opple_ch.ZCL_INIT_ATTRS is OppleRemoteClusterHandler.ZCL_INIT_ATTRS - - # double check we didn't modify the class variable - assert OppleRemoteClusterHandler.ZCL_INIT_ATTRS == {} + # The quirks v2 button entity is created and usable + entity = get_entity(zha_device, platform=Platform.BUTTON, entity_type=Button) + assert entity is not None - # check if REPORT_CONFIG is empty, both instance and class variable - assert opple_ch.REPORT_CONFIG == () - assert OppleRemoteClusterHandler.REPORT_CONFIG == () + # No bind / configure_reporting / read_attributes happened on the Opple cluster: + # the button declares neither reporting nor an attribute init, so there's + # nothing for ZHA to configure. + assert len(opple_cluster.bind.mock_calls) == 0 + assert len(opple_cluster.configure_reporting_multiple.mock_calls) == 0 + assert len(opple_cluster.read_attributes.mock_calls) == 0 diff --git a/tests/test_cluster_handlers.py b/tests/test_cluster_handlers.py deleted file mode 100644 index 5bbe21549..000000000 --- a/tests/test_cluster_handlers.py +++ /dev/null @@ -1,1515 +0,0 @@ -"""Test ZHA Core cluster_handlers.""" - -# pylint:disable=redefined-outer-name,too-many-lines - -from __future__ import annotations - -import logging -import math -from typing import TYPE_CHECKING, Any -from unittest import mock -from unittest.mock import AsyncMock, MagicMock, call, patch - -import pytest -from zhaquirks.centralite.cl_3130 import CentraLite3130 -from zhaquirks.xiaomi.aqara.sensor_switch_aq3 import BUTTON_DEVICE_TYPE, SwitchAQ3 -from zigpy.device import Device as ZigpyDevice -from zigpy.endpoint import Endpoint as ZigpyEndpoint -import zigpy.exceptions -import zigpy.profiles.zha -from zigpy.quirks import DEVICE_REGISTRY -import zigpy.types as t -from zigpy.zcl import foundation -import zigpy.zcl.clusters -from zigpy.zcl.clusters import CLUSTERS_BY_ID -from zigpy.zcl.clusters.general import ( - Basic, - Identify, - LevelControl, - MultistateInput, - OnOff, - Ota, - PollControl, - PowerConfiguration, -) -from zigpy.zcl.clusters.homeautomation import Diagnostic -from zigpy.zcl.clusters.lighting import Color -from zigpy.zcl.clusters.measurement import TemperatureMeasurement -from zigpy.zcl.helpers import ReportingConfig -import zigpy.zdo.types as zdo_t - -from tests.common import ( - SIG_EP_INPUT, - SIG_EP_OUTPUT, - SIG_EP_PROFILE, - SIG_EP_TYPE, - create_mock_zigpy_device, - get_entity, - join_zigpy_device, - send_attributes_report, - zigpy_device_from_json, -) -from zha.application import Platform -from zha.application.const import ( - ATTR_QUIRK_ID, - ZHA_CLUSTER_HANDLER_MSG_BIND, - ZHA_CLUSTER_HANDLER_MSG_CFG_RPT, -) -from zha.application.gateway import Gateway -from zha.application.platforms.button import IdentifyButton -from zha.exceptions import ZHAException -from zha.zigbee.cluster_handlers import ( - AttrReportConfig, - ClientClusterHandler, - ClusterBindEvent, - ClusterConfigureReportingEvent, - ClusterHandler, - ClusterHandlerStatus, - parse_and_log_command, - retry_request, -) -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_COLOR, - CLUSTER_HANDLER_LEVEL, - CLUSTER_HANDLER_ON_OFF, -) -from zha.zigbee.cluster_handlers.lighting import ColorClusterHandler -from zha.zigbee.cluster_handlers.lightlink import LightLinkClusterHandler -from zha.zigbee.cluster_handlers.registries import ( - CLIENT_CLUSTER_HANDLER_REGISTRY, - CLUSTER_HANDLER_REGISTRY, -) -from zha.zigbee.device import Device -from zha.zigbee.endpoint import Endpoint - - -@pytest.fixture -def ieee(): - """IEEE fixture.""" - return t.EUI64.deserialize(b"ieeeaddr")[0] - - -@pytest.fixture -def nwk(): - """NWK fixture.""" - return t.NWK(0xBEEF) - - -def zigpy_coordinator_device_mock(zha_gateway: Gateway) -> ZigpyDevice: - """Coordinator device fixture.""" - - coordinator = create_mock_zigpy_device( - zha_gateway, - { - 1: { - SIG_EP_INPUT: [0x1000], - SIG_EP_OUTPUT: [], - SIG_EP_TYPE: 0x1234, - SIG_EP_PROFILE: 0x0104, - } - }, - "00:11:22:33:44:55:66:77", - "test manufacturer", - "test model", - nwk=0x0000, - ) - coordinator.add_to_group = AsyncMock(return_value=[0]) - return coordinator - - -def endpoint_mock(zigpy_coordinator_device: ZigpyDevice) -> Endpoint: - """Endpoint cluster_handlers fixture.""" - endpoint_mock = mock.MagicMock(spec_set=Endpoint) - endpoint_mock.zigpy_endpoint.device.application.get_device.return_value = ( - zigpy_coordinator_device - ) - endpoint_mock.device.skip_configuration = False - endpoint_mock.id = 1 - return endpoint_mock - - -@pytest.mark.parametrize( - ("cluster_id", "bind_count", "attrs"), - [ - (zigpy.zcl.clusters.general.Basic.cluster_id, 0, set()), - ( - zigpy.zcl.clusters.general.PowerConfiguration.cluster_id, - 1, - {"battery_voltage", "battery_percentage_remaining"}, - ), - ( - zigpy.zcl.clusters.general.DeviceTemperature.cluster_id, - 1, - {"current_temperature"}, - ), - (zigpy.zcl.clusters.general.Identify.cluster_id, 0, set()), - (zigpy.zcl.clusters.general.Groups.cluster_id, 0, set()), - (zigpy.zcl.clusters.general.Scenes.cluster_id, 1, set()), - (zigpy.zcl.clusters.general.OnOff.cluster_id, 1, {"on_off"}), - (zigpy.zcl.clusters.general.OnOffConfiguration.cluster_id, 1, set()), - (zigpy.zcl.clusters.general.LevelControl.cluster_id, 1, {"current_level"}), - (zigpy.zcl.clusters.general.Alarms.cluster_id, 1, set()), - (zigpy.zcl.clusters.general.AnalogInput.cluster_id, 1, {"present_value"}), - (zigpy.zcl.clusters.general.AnalogOutput.cluster_id, 1, {"present_value"}), - (zigpy.zcl.clusters.general.AnalogValue.cluster_id, 1, {"present_value"}), - (zigpy.zcl.clusters.general.AnalogOutput.cluster_id, 1, {"present_value"}), - (zigpy.zcl.clusters.general.BinaryOutput.cluster_id, 1, {"present_value"}), - (zigpy.zcl.clusters.general.BinaryValue.cluster_id, 1, {"present_value"}), - (zigpy.zcl.clusters.general.MultistateInput.cluster_id, 1, {"present_value"}), - (zigpy.zcl.clusters.general.MultistateOutput.cluster_id, 1, {"present_value"}), - (zigpy.zcl.clusters.general.MultistateValue.cluster_id, 1, {"present_value"}), - (zigpy.zcl.clusters.general.Commissioning.cluster_id, 1, set()), - (zigpy.zcl.clusters.general.Partition.cluster_id, 1, set()), - (zigpy.zcl.clusters.general.Ota.cluster_id, 0, set()), - (zigpy.zcl.clusters.general.PowerProfile.cluster_id, 1, set()), - (zigpy.zcl.clusters.general.ApplianceControl.cluster_id, 1, set()), - (zigpy.zcl.clusters.general.GreenPowerProxy.cluster_id, 0, set()), - (zigpy.zcl.clusters.closures.DoorLock.cluster_id, 1, {"lock_state"}), - ( - zigpy.zcl.clusters.hvac.Thermostat.cluster_id, - 1, - { - "local_temperature", - "occupied_cooling_setpoint", - "occupied_heating_setpoint", - "unoccupied_cooling_setpoint", - "unoccupied_heating_setpoint", - "running_mode", - "running_state", - "system_mode", - "occupancy", - "pi_cooling_demand", - "pi_heating_demand", - }, - ), - (zigpy.zcl.clusters.hvac.Fan.cluster_id, 1, {"fan_mode"}), - ( - Color.cluster_id, - 1, - { - "current_x", - "current_y", - "color_temperature", - }, - ), - ( - zigpy.zcl.clusters.measurement.IlluminanceMeasurement.cluster_id, - 1, - {"measured_value"}, - ), - ( - zigpy.zcl.clusters.measurement.IlluminanceLevelSensing.cluster_id, - 1, - {"level_status"}, - ), - ( - zigpy.zcl.clusters.measurement.TemperatureMeasurement.cluster_id, - 1, - {"measured_value"}, - ), - ( - zigpy.zcl.clusters.measurement.PressureMeasurement.cluster_id, - 1, - {"measured_value"}, - ), - ( - zigpy.zcl.clusters.measurement.FlowMeasurement.cluster_id, - 1, - {"measured_value"}, - ), - ( - zigpy.zcl.clusters.measurement.RelativeHumidity.cluster_id, - 1, - {"measured_value"}, - ), - (zigpy.zcl.clusters.measurement.OccupancySensing.cluster_id, 1, {"occupancy"}), - ( - zigpy.zcl.clusters.smartenergy.Metering.cluster_id, - 1, - { - "instantaneous_demand", - "current_summ_delivered", - "current_tier1_summ_delivered", - "current_tier2_summ_delivered", - "current_tier3_summ_delivered", - "current_tier4_summ_delivered", - "current_tier5_summ_delivered", - "current_tier6_summ_delivered", - "current_summ_received", - "status", - }, - ), - ( - zigpy.zcl.clusters.homeautomation.ElectricalMeasurement.cluster_id, - 1, - { - "ac_current_divisor", - "ac_current_multiplier", - "ac_frequency", - "ac_power_divisor", - "ac_power_multiplier", - "ac_voltage_divisor", - "ac_voltage_multiplier", - "active_power", - "active_power_ph_b", - "active_power_ph_c", - "total_active_power", - "apparent_power", - "dc_current", - "dc_current_divisor", - "dc_current_multiplier", - "dc_power", - "dc_power_divisor", - "dc_power_multiplier", - "dc_voltage", - "dc_voltage_divisor", - "dc_voltage_multiplier", - "power_divisor", - "power_multiplier", - "rms_current", - "rms_current_ph_b", - "rms_current_ph_c", - "rms_voltage", - "rms_voltage_ph_b", - "rms_voltage_ph_c", - }, - ), - ], -) -async def test_in_cluster_handler_config( - cluster_id, bind_count, attrs, zha_gateway: Gateway -) -> None: - """Test ZHA core cluster handler configuration for input clusters.""" - zigpy_coordinator_device: ZigpyDevice = zigpy_coordinator_device_mock(zha_gateway) - endpoint: Endpoint = endpoint_mock(zigpy_coordinator_device) - zigpy_dev = create_mock_zigpy_device( - zha_gateway, - {1: {SIG_EP_INPUT: [cluster_id], SIG_EP_OUTPUT: [], SIG_EP_TYPE: 0x1234}}, - "00:11:22:33:44:55:66:77", - "test manufacturer", - "test model", - ) - - cluster = zigpy_dev.endpoints[1].in_clusters[cluster_id] - cluster_handler_class: type[ClusterHandler] | None = CLUSTER_HANDLER_REGISTRY.get( - cluster_id, {None, ClusterHandler} - ).get(None) - assert cluster_handler_class is not None - cluster_handler = cluster_handler_class(cluster, endpoint) - - assert cluster_handler.status == ClusterHandlerStatus.CREATED - - if TYPE_CHECKING: - # Workaround for https://github.com/python/mypy/issues/9005 - assert cluster_handler.status != ClusterHandlerStatus.CREATED - - await cluster_handler.async_configure() - - assert cluster_handler.status == ClusterHandlerStatus.CONFIGURED - - assert cluster.bind.call_count == bind_count - - reported_attrs = set() - - for mock_call in cluster.configure_reporting_multiple.mock_calls: - reported_attrs.update(attr_def.name for attr_def in mock_call.args[0]) - - assert attrs == reported_attrs - assert cluster.configure_reporting.call_count == 0 - assert cluster.configure_reporting_multiple.call_count == math.ceil(len(attrs) / 3) - - -async def test_cluster_handler_bind_error( - zha_gateway: Gateway, - caplog: pytest.LogCaptureFixture, -) -> None: - """Test ZHA core cluster handler bind error.""" - zigpy_coordinator_device: ZigpyDevice = zigpy_coordinator_device_mock(zha_gateway) - endpoint: Endpoint = endpoint_mock(zigpy_coordinator_device) - zigpy_dev = create_mock_zigpy_device( - zha_gateway, - {1: {SIG_EP_INPUT: [OnOff.cluster_id], SIG_EP_OUTPUT: [], SIG_EP_TYPE: 0x1234}}, - "00:11:22:33:44:55:66:77", - "test manufacturer", - "test model", - ) - - cluster: zigpy.zcl.Cluster = zigpy_dev.endpoints[1].in_clusters[OnOff.cluster_id] - cluster.bind.side_effect = zigpy.exceptions.ZigbeeException - - cluster_handler_class: type[ClusterHandler] | None = CLUSTER_HANDLER_REGISTRY.get( - OnOff.cluster_id, {None, ClusterHandler} - ).get(None) - assert cluster_handler_class is not None - cluster_handler = cluster_handler_class(cluster, endpoint) - - await cluster_handler.async_configure() - - assert cluster.bind.await_count == 3 - assert cluster.configure_reporting.await_count == 0 - assert f"Failed to bind '{cluster.ep_attribute}' cluster:" in caplog.text - - -async def test_cluster_handler_configure_reporting_error( - zha_gateway: Gateway, - caplog: pytest.LogCaptureFixture, -) -> None: - """Test ZHA core cluster handler configure reporting error.""" - zigpy_coordinator_device: ZigpyDevice = zigpy_coordinator_device_mock(zha_gateway) - endpoint: Endpoint = endpoint_mock(zigpy_coordinator_device) - zigpy_dev = create_mock_zigpy_device( - zha_gateway, - {1: {SIG_EP_INPUT: [OnOff.cluster_id], SIG_EP_OUTPUT: [], SIG_EP_TYPE: 0x1234}}, - "00:11:22:33:44:55:66:77", - "test manufacturer", - "test model", - ) - - cluster: zigpy.zcl.Cluster = zigpy_dev.endpoints[1].in_clusters[OnOff.cluster_id] - cluster.configure_reporting_multiple.side_effect = zigpy.exceptions.ZigbeeException - - cluster_handler_class: type[ClusterHandler] | None = CLUSTER_HANDLER_REGISTRY.get( - OnOff.cluster_id, {None, ClusterHandler} - ).get(None) - assert cluster_handler_class is not None - cluster_handler = cluster_handler_class(cluster, endpoint) - - await cluster_handler.async_configure() - - assert cluster.bind.await_count == 1 - assert cluster.configure_reporting_multiple.await_count == 3 - assert f"failed to set reporting on '{cluster.ep_attribute}' cluster" in caplog.text - - -async def test_write_attributes_safe_key_error(zha_gateway: Gateway) -> None: - """Test ZHA core cluster handler write attributes safe key error.""" - zigpy_coordinator_device: ZigpyDevice = zigpy_coordinator_device_mock(zha_gateway) - endpoint: Endpoint = endpoint_mock(zigpy_coordinator_device) - zigpy_dev = create_mock_zigpy_device( - zha_gateway, - {1: {SIG_EP_INPUT: [OnOff.cluster_id], SIG_EP_OUTPUT: [], SIG_EP_TYPE: 0x1234}}, - "00:11:22:33:44:55:66:77", - "test manufacturer", - "test model", - ) - - cluster: zigpy.zcl.Cluster = zigpy_dev.endpoints[1].in_clusters[OnOff.cluster_id] - cluster.write_attributes = AsyncMock( - return_value=[ - foundation.WriteAttributesResponse.deserialize(b"\x01\x00\x00")[0] - ] - ) - - cluster_handler_class: type[ClusterHandler] | None = CLUSTER_HANDLER_REGISTRY.get( - OnOff.cluster_id, {None, ClusterHandler} - ).get(None) - assert cluster_handler_class is not None - cluster_handler = cluster_handler_class(cluster, endpoint) - - with pytest.raises(ZHAException, match="Failed to write attribute on_off=bar"): - await cluster_handler.write_attributes_safe( - {OnOff.AttributeDefs.on_off.name: "bar"} - ) - - -async def test_get_attributes_error( - zha_gateway: Gateway, - caplog: pytest.LogCaptureFixture, -) -> None: - """Test ZHA core cluster handler get attributes timeout error.""" - zigpy_coordinator_device: ZigpyDevice = zigpy_coordinator_device_mock(zha_gateway) - endpoint: Endpoint = endpoint_mock(zigpy_coordinator_device) - zigpy_dev = create_mock_zigpy_device( - zha_gateway, - {1: {SIG_EP_INPUT: [OnOff.cluster_id], SIG_EP_OUTPUT: [], SIG_EP_TYPE: 0x1234}}, - "00:11:22:33:44:55:66:77", - "test manufacturer", - "test model", - ) - - cluster: zigpy.zcl.Cluster = zigpy_dev.endpoints[1].in_clusters[OnOff.cluster_id] - cluster.read_attributes.side_effect = zigpy.exceptions.ZigbeeException - - cluster_handler_class: type[ClusterHandler] | None = CLUSTER_HANDLER_REGISTRY.get( - OnOff.cluster_id, {None, ClusterHandler} - ).get(None) - assert cluster_handler_class is not None - cluster_handler = cluster_handler_class(cluster, endpoint) - - await cluster_handler.get_attributes(["foo"]) - - assert ( - f"failed to get attributes '['foo']' on '{OnOff.ep_attribute}' cluster" - in caplog.text - ) - - -async def test_get_attributes_error_raises( - zha_gateway: Gateway, - caplog: pytest.LogCaptureFixture, -) -> None: - """Test ZHA core cluster handler get attributes timeout error.""" - zigpy_coordinator_device: ZigpyDevice = zigpy_coordinator_device_mock(zha_gateway) - endpoint: Endpoint = endpoint_mock(zigpy_coordinator_device) - zigpy_dev = create_mock_zigpy_device( - zha_gateway, - {1: {SIG_EP_INPUT: [OnOff.cluster_id], SIG_EP_OUTPUT: [], SIG_EP_TYPE: 0x1234}}, - "00:11:22:33:44:55:66:77", - "test manufacturer", - "test model", - ) - - cluster: zigpy.zcl.Cluster = zigpy_dev.endpoints[1].in_clusters[OnOff.cluster_id] - cluster.read_attributes.side_effect = zigpy.exceptions.ZigbeeException - - cluster_handler_class: type[ClusterHandler] | None = CLUSTER_HANDLER_REGISTRY.get( - OnOff.cluster_id, {None, ClusterHandler} - ).get(None) - assert cluster_handler_class is not None - cluster_handler = cluster_handler_class(cluster, endpoint) - - with pytest.raises(zigpy.exceptions.ZigbeeException): - await cluster_handler._get_attributes(True, ["foo"]) - - assert ( - f"failed to get attributes '['foo']' on '{OnOff.ep_attribute}' cluster" - in caplog.text - ) - - -@pytest.mark.parametrize( - ("cluster_id", "bind_count"), - [ - (0x0000, 0), - (0x0001, 1), - (0x0002, 1), - (0x0003, 0), - (0x0004, 0), - (0x0005, 1), - (0x0006, 1), - (0x0007, 1), - (0x0008, 1), - (0x0009, 1), - (0x0015, 1), - (0x0016, 1), - (0x0019, 0), - (0x001A, 1), - (0x001B, 1), - (0x0020, 1), - (0x0021, 0), - (0x0101, 1), - (0x0202, 1), - (0x0300, 1), - (0x0400, 1), - (0x0402, 1), - (0x0403, 1), - (0x0405, 1), - (0x0406, 1), - (0x0702, 1), - (0x0B04, 1), - ], -) -async def test_out_cluster_handler_config( - cluster_id: int, - bind_count: int, - zha_gateway: Gateway, -) -> None: - """Test ZHA core cluster handler configuration for output clusters.""" - zigpy_coordinator_device: ZigpyDevice = zigpy_coordinator_device_mock(zha_gateway) - endpoint: Endpoint = endpoint_mock(zigpy_coordinator_device) - zigpy_dev = create_mock_zigpy_device( - zha_gateway, - {1: {SIG_EP_OUTPUT: [cluster_id], SIG_EP_INPUT: [], SIG_EP_TYPE: 0x1234}}, - "00:11:22:33:44:55:66:77", - "test manufacturer", - "test model", - ) - - cluster = zigpy_dev.endpoints[1].out_clusters[cluster_id] - cluster.bind_only = True - cluster_handler_class: type[ClusterHandler] | None = CLUSTER_HANDLER_REGISTRY.get( - cluster_id, {None: ClusterHandler} - ).get(None) - assert cluster_handler_class is not None - cluster_handler = cluster_handler_class(cluster, endpoint) - - await cluster_handler.async_configure() - - assert cluster.bind.call_count == bind_count - assert cluster.configure_reporting.call_count == 0 - - -def test_cluster_handler_registry() -> None: - """Test ZIGBEE cluster handler Registry.""" - - # get all exposed features from zigpy quirks registry - cluster_exposed_feature_map: dict[int, set[str | None]] = {} - for cluster_id in CLUSTERS_BY_ID: - cluster_exposed_feature_map[cluster_id] = {None} - - # loop over custom clusters in v2 quirks registry - for quirks in DEVICE_REGISTRY.registry_v2.values(): - for quirk_reg_entry in quirks: - # get standalone adds_metadata and adds_metadata from replaces_metadata - all_metadata = set(quirk_reg_entry.adds_metadata) | { - rm.add for rm in quirk_reg_entry.replaces_metadata - } - for metadata in all_metadata: - cluster_exposed_feature_map[metadata.cluster.cluster_id] = {None} - - # loop over custom clusters in v1 quirks registry - for manufacturer in DEVICE_REGISTRY.registry_v1.values(): - for model_quirk_list in manufacturer.values(): - for quirk in model_quirk_list: - qid: set[str] | str = getattr(quirk, ATTR_QUIRK_ID, set()) - exposed_features: set[str] = {qid} if isinstance(qid, str) else set(qid) - - device_description: dict[str, dict[str, Any]] = getattr( - quirk, "replacement", None - ) or getattr(quirk, "signature", None) - - for endpoint in device_description["endpoints"].values(): - cluster_ids = set() - if "input_clusters" in endpoint: - cluster_ids.update(endpoint["input_clusters"]) - if "output_clusters" in endpoint: - cluster_ids.update(endpoint["output_clusters"]) - for cluster_id in cluster_ids: - if not isinstance(cluster_id, int): - cluster_id = cluster_id.cluster_id - if cluster_id not in cluster_exposed_feature_map: - cluster_exposed_feature_map[cluster_id] = {None} - cluster_exposed_feature_map[cluster_id].update(exposed_features) - - for ( - cluster_id, - cluster_handler_classes, - ) in CLUSTER_HANDLER_REGISTRY.items(): - # test cluster_id is valid - assert isinstance(cluster_id, int) - assert 0 <= cluster_id <= 0xFFFF - - # test all registered clusters are used in zigpy or quirks - assert cluster_id in cluster_exposed_feature_map - - assert isinstance(cluster_handler_classes, dict) - for ch_exposed_feature, cluster_handler in cluster_handler_classes.items(): - # test cluster handler is not quirk specific - # or only has a single exposed feature - assert ch_exposed_feature is None or isinstance(ch_exposed_feature, str) - assert issubclass(cluster_handler, ClusterHandler) - - # test cluster handler exposed feature is used in quirk with that cluster - assert ch_exposed_feature in cluster_exposed_feature_map[cluster_id] - - -def test_epch_claim_cluster_handlers(cluster_handler) -> None: - """Test cluster handler claiming.""" - - ch_1 = cluster_handler(CLUSTER_HANDLER_ON_OFF, 6) - ch_2 = cluster_handler(CLUSTER_HANDLER_LEVEL, 8) - ch_3 = cluster_handler(CLUSTER_HANDLER_COLOR, 768) - - mock_dev = mock.MagicMock(spec=Device) - mock_dev.unique_id = "00:11:22:33:44:55:66:77" - - ep_cluster_handlers = Endpoint(mock.MagicMock(spec_set=ZigpyEndpoint), mock_dev) - all_cluster_handlers = {ch_1.id: ch_1, ch_2.id: ch_2, ch_3.id: ch_3} - with mock.patch.dict( - ep_cluster_handlers.all_cluster_handlers, all_cluster_handlers, clear=True - ): - assert ch_1.id not in ep_cluster_handlers.claimed_cluster_handlers - assert ch_2.id not in ep_cluster_handlers.claimed_cluster_handlers - assert ch_3.id not in ep_cluster_handlers.claimed_cluster_handlers - - ep_cluster_handlers.claim_cluster_handlers([ch_2]) - assert ch_1.id not in ep_cluster_handlers.claimed_cluster_handlers - assert ch_2.id in ep_cluster_handlers.claimed_cluster_handlers - assert ep_cluster_handlers.claimed_cluster_handlers[ch_2.id] is ch_2 - assert ch_3.id not in ep_cluster_handlers.claimed_cluster_handlers - - ep_cluster_handlers.claim_cluster_handlers([ch_3, ch_1]) - assert ch_1.id in ep_cluster_handlers.claimed_cluster_handlers - assert ep_cluster_handlers.claimed_cluster_handlers[ch_1.id] is ch_1 - assert ch_2.id in ep_cluster_handlers.claimed_cluster_handlers - assert ep_cluster_handlers.claimed_cluster_handlers[ch_2.id] is ch_2 - assert ch_3.id in ep_cluster_handlers.claimed_cluster_handlers - assert ep_cluster_handlers.claimed_cluster_handlers[ch_3.id] is ch_3 - assert "1:0x0300" in ep_cluster_handlers.claimed_cluster_handlers - - -@mock.patch("zha.zigbee.endpoint.Endpoint.add_client_cluster_handlers") -async def test_ep_cluster_handlers_all_cluster_handlers( - m1, # pylint: disable=unused-argument - zha_gateway: Gateway, -) -> None: - """Test Endpointcluster_handlers adding all cluster_handlers.""" - zha_device = await join_zigpy_device( - zha_gateway, - create_mock_zigpy_device( - zha_gateway, - { - 1: { - SIG_EP_INPUT: [0, 1, 6, 8], - SIG_EP_OUTPUT: [], - SIG_EP_TYPE: zigpy.profiles.zha.DeviceType.ON_OFF_SWITCH, - SIG_EP_PROFILE: 0x0104, - }, - 2: { - SIG_EP_INPUT: [0, 1, 6, 8, 768], - SIG_EP_OUTPUT: [], - SIG_EP_TYPE: 0x0000, - SIG_EP_PROFILE: 0x0104, - }, - }, - ), - ) - assert "1:0x0000" in zha_device._endpoints[1].all_cluster_handlers - assert "1:0x0001" in zha_device._endpoints[1].all_cluster_handlers - assert "1:0x0006" in zha_device._endpoints[1].all_cluster_handlers - assert "1:0x0008" in zha_device._endpoints[1].all_cluster_handlers - assert "1:0x0300" not in zha_device._endpoints[1].all_cluster_handlers - assert "2:0x0000" not in zha_device._endpoints[1].all_cluster_handlers - assert "2:0x0001" not in zha_device._endpoints[1].all_cluster_handlers - assert "2:0x0006" not in zha_device._endpoints[1].all_cluster_handlers - assert "2:0x0008" not in zha_device._endpoints[1].all_cluster_handlers - assert "2:0x0300" not in zha_device._endpoints[1].all_cluster_handlers - assert "1:0x0000" not in zha_device._endpoints[2].all_cluster_handlers - assert "1:0x0001" not in zha_device._endpoints[2].all_cluster_handlers - assert "1:0x0006" not in zha_device._endpoints[2].all_cluster_handlers - assert "1:0x0008" not in zha_device._endpoints[2].all_cluster_handlers - assert "1:0x0300" not in zha_device._endpoints[2].all_cluster_handlers - assert "2:0x0000" in zha_device._endpoints[2].all_cluster_handlers - assert "2:0x0001" in zha_device._endpoints[2].all_cluster_handlers - assert "2:0x0006" in zha_device._endpoints[2].all_cluster_handlers - assert "2:0x0008" in zha_device._endpoints[2].all_cluster_handlers - assert "2:0x0300" in zha_device._endpoints[2].all_cluster_handlers - - -@mock.patch("zha.zigbee.endpoint.Endpoint.add_client_cluster_handlers") -async def test_cluster_handler_power_config( - m1, # pylint: disable=unused-argument - zha_gateway: Gateway, -) -> None: - """Test that cluster_handlers only get a single power cluster_handler.""" - in_clusters = [0, 1, 6, 8] - zha_device: Device = await join_zigpy_device( - zha_gateway, - create_mock_zigpy_device( - zha_gateway, - endpoints={ - 1: { - SIG_EP_INPUT: in_clusters, - SIG_EP_OUTPUT: [], - SIG_EP_TYPE: 0x0000, - SIG_EP_PROFILE: 0x0104, - }, - 2: { - SIG_EP_INPUT: [*in_clusters, 768], - SIG_EP_OUTPUT: [], - SIG_EP_TYPE: 0x0000, - SIG_EP_PROFILE: 0x0104, - }, - }, - ieee="01:2d:6f:00:0a:90:69:e8", - ), - ) - assert "1:0x0000" in zha_device._endpoints[1].all_cluster_handlers - assert "1:0x0001" in zha_device._endpoints[1].all_cluster_handlers - assert "1:0x0006" in zha_device._endpoints[1].all_cluster_handlers - assert "1:0x0008" in zha_device._endpoints[1].all_cluster_handlers - assert "1:0x0300" not in zha_device._endpoints[1].all_cluster_handlers - assert "2:0x0000" in zha_device._endpoints[2].all_cluster_handlers - assert "2:0x0001" in zha_device._endpoints[2].all_cluster_handlers - assert "2:0x0006" in zha_device._endpoints[2].all_cluster_handlers - assert "2:0x0008" in zha_device._endpoints[2].all_cluster_handlers - assert "2:0x0300" in zha_device._endpoints[2].all_cluster_handlers - - zha_device = await join_zigpy_device( - zha_gateway, - create_mock_zigpy_device( - zha_gateway, - endpoints={ - 1: { - SIG_EP_INPUT: [], - SIG_EP_OUTPUT: [], - SIG_EP_TYPE: 0x0000, - SIG_EP_PROFILE: 0x0104, - }, - 2: { - SIG_EP_INPUT: in_clusters, - SIG_EP_OUTPUT: [], - SIG_EP_TYPE: 0x0000, - SIG_EP_PROFILE: 0x0104, - }, - }, - ieee="02:2d:6f:00:0a:90:69:e8", - ), - ) - assert "1:0x0001" not in zha_device._endpoints[1].all_cluster_handlers - assert "2:0x0001" in zha_device._endpoints[2].all_cluster_handlers - - zha_device = await join_zigpy_device( - zha_gateway, - create_mock_zigpy_device( - zha_gateway, - endpoints={ - 2: { - SIG_EP_INPUT: in_clusters, - SIG_EP_OUTPUT: [], - SIG_EP_TYPE: 0x0000, - SIG_EP_PROFILE: 0x0104, - } - }, - ieee="03:2d:6f:00:0a:90:69:e8", - ), - ) - assert "2:0x0001" in zha_device._endpoints[2].all_cluster_handlers - - -async def test_ep_cluster_handlers_configure(cluster_handler) -> None: - """Test unclaimed cluster handlers.""" - - ch_1 = cluster_handler(CLUSTER_HANDLER_ON_OFF, 6) - ch_2 = cluster_handler(CLUSTER_HANDLER_LEVEL, 8) - ch_3 = cluster_handler(CLUSTER_HANDLER_COLOR, 768) - ch_3.async_configure = AsyncMock(side_effect=TimeoutError) - ch_3.async_initialize = AsyncMock(side_effect=TimeoutError) - ch_4 = cluster_handler(CLUSTER_HANDLER_ON_OFF, 6) - ch_5 = cluster_handler(CLUSTER_HANDLER_LEVEL, 8) - ch_5.async_configure = AsyncMock(side_effect=TimeoutError) - ch_5.async_initialize = AsyncMock(side_effect=TimeoutError) - - endpoint_mock = mock.MagicMock(spec_set=ZigpyEndpoint) - type(endpoint_mock).in_clusters = mock.PropertyMock(return_value={}) - type(endpoint_mock).out_clusters = mock.PropertyMock(return_value={}) - type(endpoint_mock).profile_id = mock.PropertyMock( - return_value=zigpy.profiles.zha.PROFILE_ID - ) - type(endpoint_mock).device_type = mock.PropertyMock( - return_value=zigpy.profiles.zha.DeviceType.COLOR_DIMMABLE_LIGHT - ) - zha_dev = mock.MagicMock(spec=Device) - zha_dev.unique_id = "00:11:22:33:44:55:66:77" - type(zha_dev).exposes_features = mock.PropertyMock(return_value=set()) - endpoint = Endpoint.new(endpoint_mock, zha_dev) - - claimed = {ch_1.id: ch_1, ch_2.id: ch_2, ch_3.id: ch_3} - client_handlers = {ch_4.id: ch_4, ch_5.id: ch_5} - - with ( - mock.patch.dict(endpoint.claimed_cluster_handlers, claimed, clear=True), - mock.patch.dict(endpoint.client_cluster_handlers, client_handlers, clear=True), - ): - await endpoint.async_configure() - await endpoint.async_initialize(mock.sentinel.from_cache) - - for ch in [*claimed.values(), *client_handlers.values()]: - assert ch.async_initialize.call_count == 1 - assert ch.async_initialize.await_count == 1 - assert ch.async_initialize.call_args[0][0] is mock.sentinel.from_cache - assert ch.async_configure.call_count == 1 - assert ch.async_configure.await_count == 1 - - assert ch_3.debug.call_count == 2 - assert ch_5.debug.call_count == 2 - - -def zigpy_zll_device_mock(zha_gateway: Gateway) -> ZigpyDevice: - """ZLL device fixture.""" - - return create_mock_zigpy_device( - zha_gateway, - { - 1: { - SIG_EP_INPUT: [0x1000], - SIG_EP_OUTPUT: [], - SIG_EP_TYPE: 0x1234, - SIG_EP_PROFILE: zigpy.profiles.zll.PROFILE_ID, - } - }, - "00:11:22:33:44:55:66:77", - "test manufacturer", - "test model", - ) - - -async def test_zll_device_groups(zha_gateway: Gateway) -> None: - """Test adding coordinator to ZLL groups.""" - zigpy_zll_device: ZigpyDevice = zigpy_zll_device_mock(zha_gateway) - zigpy_coordinator_device: ZigpyDevice = zigpy_coordinator_device_mock(zha_gateway) - endpoint: Endpoint = endpoint_mock(zigpy_coordinator_device) - - cluster = zigpy_zll_device.endpoints[1].lightlink - cluster_handler = LightLinkClusterHandler(cluster, endpoint) - get_group_identifiers_rsp = zigpy.zcl.clusters.lightlink.LightLink.commands_by_name[ - "get_group_identifiers_rsp" - ].schema - - with patch.object( - cluster, - "get_group_identifiers", - AsyncMock( - return_value=get_group_identifiers_rsp( - total=0, start_index=0, group_info_records=[] - ) - ), - ) as get_group_identifiers: - await cluster_handler.async_configure() - assert get_group_identifiers.await_count == 1 - assert cluster.bind.call_count == 0 - assert zigpy_coordinator_device.add_to_group.await_count == 1 - assert zigpy_coordinator_device.add_to_group.await_args[0][0] == 0x0000 - - zigpy_coordinator_device.add_to_group.reset_mock() - group_1 = zigpy.zcl.clusters.lightlink.GroupInfoRecord(0xABCD, 0x00) - group_2 = zigpy.zcl.clusters.lightlink.GroupInfoRecord(0xAABB, 0x00) - with patch.object( - cluster, - "get_group_identifiers", - AsyncMock( - return_value=get_group_identifiers_rsp( - total=2, start_index=0, group_info_records=[group_1, group_2] - ) - ), - ) as get_group_identifiers: - await cluster_handler.async_configure() - assert get_group_identifiers.await_count == 1 - assert cluster.bind.call_count == 0 - assert zigpy_coordinator_device.add_to_group.await_count == 2 - assert ( - zigpy_coordinator_device.add_to_group.await_args_list[0][0][0] - == group_1.group_id - ) - assert ( - zigpy_coordinator_device.add_to_group.await_args_list[1][0][0] - == group_2.group_id - ) - - -async def test_cluster_no_ep_attribute( - zha_gateway: Gateway, # pylint: disable=unused-argument -) -> None: - """Test cluster handlers for clusters without ep_attribute.""" - - zha_device = await join_zigpy_device( - zha_gateway, - create_mock_zigpy_device( - zha_gateway, - { - 1: { - SIG_EP_INPUT: [0x042E], - SIG_EP_OUTPUT: [], - SIG_EP_TYPE: 0x1234, - SIG_EP_PROFILE: zigpy.profiles.zha.PROFILE_ID, - } - }, - ), - ) - - assert "1:0x042e" in zha_device._endpoints[1].all_cluster_handlers - assert zha_device._endpoints[1].all_cluster_handlers["1:0x042e"].name - - -async def test_configure_reporting(zha_gateway: Gateway) -> None: - """Test setting up a cluster handler and configuring attribute reporting in two batches.""" - - zigpy_coordinator_device: ZigpyDevice = zigpy_coordinator_device_mock(zha_gateway) - endpoint: Endpoint = endpoint_mock(zigpy_coordinator_device) - - class TestZigbeeClusterHandler(ClusterHandler): - """Test cluster handler that requests reporting for four attributes.""" - - BIND = True - REPORT_CONFIG = ( - # By name - AttrReportConfig(attr="current_x", config=(1, 60, 1)), - AttrReportConfig(attr="current_hue", config=(1, 60, 2)), - AttrReportConfig(attr="color_temperature", config=(1, 60, 3)), - AttrReportConfig(attr="current_y", config=(1, 60, 4)), - ) - - mock_ep = mock.AsyncMock() - mock_ep.profile_id = zigpy.profiles.zha.PROFILE_ID - mock_ep.device.zdo = AsyncMock() - - cluster = Color(mock_ep) - cluster.bind = AsyncMock( - spec_set=cluster.bind, - return_value=[zdo_t.Status.SUCCESS], # ZDOCmd.Bind_rsp - ) - - def mock_configure_reporting_multiple(config): - return dict.fromkeys(config, foundation.Status.SUCCESS) - - cluster.configure_reporting_multiple = AsyncMock( - spec_set=cluster.configure_reporting_multiple, - side_effect=mock_configure_reporting_multiple, - ) - - cluster_handler = TestZigbeeClusterHandler(cluster, endpoint) - await cluster_handler.async_configure() - - # Since we request reporting for four attributes, we need to make two calls (3 + 1) - - assert cluster.configure_reporting_multiple.mock_calls == [ - mock.call( - { - Color.AttributeDefs.current_x: ReportingConfig(1, 60, 1), - Color.AttributeDefs.current_hue: ReportingConfig(1, 60, 2), - Color.AttributeDefs.color_temperature: ReportingConfig(1, 60, 3), - } - ), - mock.call( - { - Color.AttributeDefs.current_y: ReportingConfig(1, 60, 4), - } - ), - ] - - -@pytest.mark.parametrize( - ("response", "expected_statuses"), - [ - # All attributes succeeded - ( - { - Color.AttributeDefs.current_x: foundation.Status.SUCCESS, - Color.AttributeDefs.current_y: foundation.Status.SUCCESS, - }, - {"current_x": "SUCCESS", "current_y": "SUCCESS"}, - ), - # Empty dict: unexpected response, all attributes marked as FAILURE - ( - {}, - {"current_x": "FAILURE", "current_y": "FAILURE"}, - ), - # Per-attribute results: mixed success/failure - ( - { - Color.AttributeDefs.current_x: foundation.Status.SUCCESS, - Color.AttributeDefs.current_y: foundation.Status.UNSUPPORTED_ATTRIBUTE, - }, - {"current_x": "SUCCESS", "current_y": "UNSUPPORTED_ATTRIBUTE"}, - ), - ], - ids=[ - "all_success", - "empty_dict", - "mixed_per_attribute", - ], -) -async def test_configure_reporting_status( - zha_gateway: Gateway, response, expected_statuses -) -> None: - """Test configure reporting status parsing via async_configure.""" - zigpy_coordinator_device: ZigpyDevice = zigpy_coordinator_device_mock(zha_gateway) - endpoint: Endpoint = endpoint_mock(zigpy_coordinator_device) - - class TestClusterHandler(ClusterHandler): - BIND = True - REPORT_CONFIG = ( - AttrReportConfig(attr="current_x", config=(1, 60, 1)), - AttrReportConfig(attr="current_y", config=(1, 60, 2)), - ) - - mock_ep = mock.AsyncMock() - mock_ep.profile_id = zigpy.profiles.zha.PROFILE_ID - mock_ep.device.zdo = AsyncMock() - - cluster = Color(mock_ep) - cluster.bind = AsyncMock( - spec_set=cluster.bind, - return_value=[zdo_t.Status.SUCCESS], - ) - cluster.configure_reporting_multiple = AsyncMock( - spec_set=cluster.configure_reporting_multiple, - return_value=response, - ) - - cluster_handler = TestClusterHandler(cluster, endpoint) - - mock_emit = MagicMock() - cluster_handler._endpoint.device.emit = mock_emit - - await cluster_handler.async_configure() - - assert mock_emit.call_args_list == [ - mock.call( - ZHA_CLUSTER_HANDLER_MSG_BIND, - ClusterBindEvent( - cluster_name=cluster.name, - cluster_id=cluster.cluster_id, - cluster_handler_unique_id=cluster_handler.unique_id, - success=True, - ), - ), - mock.call( - ZHA_CLUSTER_HANDLER_MSG_CFG_RPT, - ClusterConfigureReportingEvent( - cluster_name=cluster.name, - cluster_id=cluster.cluster_id, - cluster_handler_unique_id=cluster_handler.unique_id, - attributes={ - attr_name: { - "min": 1, - "max": 60, - "id": attr_name, - "name": attr_name, - "change": idx + 1, - "status": expected_status, - } - for idx, (attr_name, expected_status) in enumerate( - expected_statuses.items() - ) - }, - ), - ), - ] - - -async def test_configure_reporting_status_empty_second_chunk( - zha_gateway: Gateway, -) -> None: - """Test that an empty response for one chunk doesn't overwrite other chunks' statuses.""" - zigpy_coordinator_device: ZigpyDevice = zigpy_coordinator_device_mock(zha_gateway) - endpoint: Endpoint = endpoint_mock(zigpy_coordinator_device) - - class TestClusterHandler(ClusterHandler): - BIND = True - REPORT_CONFIG = ( - AttrReportConfig(attr="current_x", config=(1, 60, 1)), - AttrReportConfig(attr="current_y", config=(1, 60, 2)), - AttrReportConfig(attr="current_hue", config=(1, 60, 3)), - # 4th attribute forces a second chunk (REPORT_CONFIG_ATTR_PER_REQ=3) - AttrReportConfig(attr="color_temperature", config=(1, 60, 4)), - ) - - mock_ep = mock.AsyncMock() - mock_ep.profile_id = zigpy.profiles.zha.PROFILE_ID - mock_ep.device.zdo = AsyncMock() - - cluster = Color(mock_ep) - cluster.bind = AsyncMock( - spec_set=cluster.bind, - return_value=[zdo_t.Status.SUCCESS], - ) - - # Chunk 1 succeeds, chunk 2 returns empty dict - chunk_responses = [ - { - Color.AttributeDefs.current_x: foundation.Status.SUCCESS, - Color.AttributeDefs.current_y: foundation.Status.SUCCESS, - Color.AttributeDefs.current_hue: foundation.Status.SUCCESS, - }, - {}, - ] - cluster.configure_reporting_multiple = AsyncMock( - spec_set=cluster.configure_reporting_multiple, - side_effect=chunk_responses, - ) - - cluster_handler = TestClusterHandler(cluster, endpoint) - - mock_emit = MagicMock() - cluster_handler._endpoint.device.emit = mock_emit - - await cluster_handler.async_configure() - - expected_statuses = { - "current_x": "SUCCESS", - "current_y": "SUCCESS", - "current_hue": "SUCCESS", - "color_temperature": "FAILURE", - } - - assert mock_emit.call_args_list == [ - mock.call( - ZHA_CLUSTER_HANDLER_MSG_BIND, - ClusterBindEvent( - cluster_name=cluster.name, - cluster_id=cluster.cluster_id, - cluster_handler_unique_id=cluster_handler.unique_id, - success=True, - ), - ), - mock.call( - ZHA_CLUSTER_HANDLER_MSG_CFG_RPT, - ClusterConfigureReportingEvent( - cluster_name=cluster.name, - cluster_id=cluster.cluster_id, - cluster_handler_unique_id=cluster_handler.unique_id, - attributes={ - attr_name: { - "min": 1, - "max": 60, - "id": attr_name, - "name": attr_name, - "change": idx + 1, - "status": expected_status, - } - for idx, (attr_name, expected_status) in enumerate( - expected_statuses.items() - ) - }, - ), - ), - ] - - -async def test_invalid_cluster_handler(zha_gateway: Gateway, caplog) -> None: # pylint: disable=unused-argument - """Test setting up a cluster handler that fails to match properly.""" - - class TestZigbeeClusterHandler(ClusterHandler): - """Test cluster handler that fails to match properly.""" - - REPORT_CONFIG = (AttrReportConfig(attr="missing_attr", config=(1, 60, 1)),) - - mock_device = mock.AsyncMock(spec_set=zigpy.device.Device) - zigpy_ep = zigpy.endpoint.Endpoint(mock_device, endpoint_id=1) - zigpy_ep.profile_id = zigpy.profiles.zha.PROFILE_ID - - cluster = zigpy_ep.add_input_cluster(Color.cluster_id) - cluster.configure_reporting_multiple = AsyncMock( - spec_set=cluster.configure_reporting_multiple, - side_effect=lambda config: dict.fromkeys(config, foundation.Status.SUCCESS), - ) - - mock_zha_device = mock.AsyncMock(spec=Device) - mock_zha_device.exposes_features = set() - mock_zha_device.unique_id = "aa:bb:cc:dd:11:22:33:44" - - zha_endpoint = Endpoint(zigpy_ep, mock_zha_device) - - # The cluster handler throws an error when matching this cluster - with pytest.raises(KeyError): - TestZigbeeClusterHandler(cluster, zha_endpoint) - - # And one is also logged at runtime - with ( - patch.dict( - CLUSTER_HANDLER_REGISTRY[cluster.cluster_id], - {None: TestZigbeeClusterHandler}, - ), - caplog.at_level(logging.WARNING), - ): - zha_endpoint.add_all_cluster_handlers() - - assert "missing_attr" in caplog.text - - -async def test_standard_cluster_handler( - zha_gateway: Gateway, -) -> None: # pylint: disable=unused-argument - """Test setting up a cluster handler that matches a standard cluster.""" - - class TestZigbeeClusterHandler(ColorClusterHandler): - """Test cluster handler that matches a standard cluster.""" - - mock_device = mock.AsyncMock(spec_set=zigpy.device.Device) - zigpy_ep = zigpy.endpoint.Endpoint(mock_device, endpoint_id=1) - zigpy_ep.profile_id = zigpy.profiles.zha.PROFILE_ID - - cluster = zigpy_ep.add_input_cluster(Color.cluster_id) - cluster.configure_reporting_multiple = AsyncMock( - spec_set=cluster.configure_reporting_multiple, - side_effect=lambda config: dict.fromkeys(config, foundation.Status.SUCCESS), - ) - - mock_zha_device = mock.AsyncMock(spec=Device) - mock_zha_device.exposes_features = set() - mock_zha_device.unique_id = "aa:bb:cc:dd:11:22:33:44" - - zha_endpoint = Endpoint(zigpy_ep, mock_zha_device) - - with patch.dict( - CLUSTER_HANDLER_REGISTRY[cluster.cluster_id], - {"__exposed_feature_id": TestZigbeeClusterHandler}, - ): - zha_endpoint.add_all_cluster_handlers() - - assert len(zha_endpoint.all_cluster_handlers) == 1 - assert isinstance( - list(zha_endpoint.all_cluster_handlers.values())[0], ColorClusterHandler - ) - - -async def test_exposed_feature_cluster_handler( - zha_gateway: Gateway, -) -> None: # pylint: disable=unused-argument - """Test setting up a cluster handler with an exposed feature.""" - - class TestZigbeeClusterHandler(ColorClusterHandler): - """Test cluster handler that matches a standard cluster.""" - - mock_device = mock.AsyncMock(spec_set=zigpy.device.Device) - zigpy_ep = zigpy.endpoint.Endpoint(mock_device, endpoint_id=1) - zigpy_ep.profile_id = zigpy.profiles.zha.PROFILE_ID - - cluster = zigpy_ep.add_input_cluster(Color.cluster_id) - cluster.configure_reporting_multiple = AsyncMock( - spec_set=cluster.configure_reporting_multiple, - side_effect=lambda config: dict.fromkeys(config, foundation.Status.SUCCESS), - ) - - mock_zha_device = mock.AsyncMock(spec=Device) - mock_zha_device.unique_id = "aa:bb:cc:dd:11:22:33:44" - mock_zha_device.exposes_features = {"__exposed_feature_id"} - zha_endpoint = Endpoint(zigpy_ep, mock_zha_device) - - with patch.dict( - CLUSTER_HANDLER_REGISTRY[cluster.cluster_id], - {"__exposed_feature_id": TestZigbeeClusterHandler}, - ): - zha_endpoint.add_all_cluster_handlers() - - assert len(zha_endpoint.all_cluster_handlers) == 1 - assert isinstance( - list(zha_endpoint.all_cluster_handlers.values())[0], TestZigbeeClusterHandler - ) - - -# parametrize side effects: -@pytest.mark.parametrize( - ("side_effect", "expected_error"), - [ - (zigpy.exceptions.ZigbeeException(), "Failed to send request"), - ( - zigpy.exceptions.ZigbeeException("Zigbee exception"), - "Failed to send request: Zigbee exception", - ), - (TimeoutError(), "Failed to send request: device did not respond"), - ], -) -async def test_retry_request( - side_effect: Exception, expected_error: str | None -) -> None: - """Test the `retry_request` decorator's handling of zigpy-internal exceptions.""" - - async def func(arg1: int, arg2: int) -> int: - assert arg1 == 1 - assert arg2 == 2 - - raise side_effect - - func = mock.AsyncMock(wraps=func) - decorated_func = retry_request(func) - - with pytest.raises(ZHAException) as exc: - await decorated_func(1, arg2=2) - - assert func.await_count == 3 - assert isinstance(exc.value, ZHAException) - assert str(exc.value) == expected_error - - -async def test_cluster_handler_naming() -> None: - """Test that all cluster handlers are named appropriately.""" - for client_cluster_handler in CLIENT_CLUSTER_HANDLER_REGISTRY.values(): - assert issubclass(client_cluster_handler, ClientClusterHandler) - assert client_cluster_handler.__name__.endswith("ClientClusterHandler") - - for cluster_handler_dict in CLUSTER_HANDLER_REGISTRY.values(): - for cluster_handler in cluster_handler_dict.values(): - assert not issubclass(cluster_handler, ClientClusterHandler) - assert cluster_handler.__name__.endswith("ClusterHandler") - - -async def test_parse_and_log_command(zha_gateway: Gateway) -> None: - """Test that `parse_and_log_command` correctly parses a known command.""" - zigpy_dev = await zigpy_device_from_json( - zha_gateway.application_controller, - "tests/data/devices/ikea-of-sweden-rodret-dimmer.json", - ) - zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) - identify_entity = get_entity( - zha_device, platform=Platform.BUTTON, entity_type=IdentifyButton - ) - identify_handler = identify_entity._cluster_handler - - assert parse_and_log_command(identify_handler, 0x00, 0x01, []) == "identify_query" - - -async def test_parse_and_log_command_unknown(zha_gateway: Gateway): - """Test that `parse_and_log_command` correctly parses an unknown command.""" - zigpy_dev = await zigpy_device_from_json( - zha_gateway.application_controller, - "tests/data/devices/ikea-of-sweden-rodret-dimmer.json", - ) - zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) - identify_entity = get_entity( - zha_device, platform=Platform.BUTTON, entity_type=IdentifyButton - ) - identify_handler = identify_entity._cluster_handler - - assert parse_and_log_command(identify_handler, 0x00, 0xAB, []) == "0xAB" - - -async def test_zha_send_event_from_quirk(zha_gateway: Gateway): - """Test that a quirk can send an event.""" - zigpy_device = create_mock_zigpy_device( - zha_gateway, - { - 1: { - SIG_EP_INPUT: [ - Basic.cluster_id, - PowerConfiguration.cluster_id, - OnOff.cluster_id, - MultistateInput.cluster_id, - ], - SIG_EP_OUTPUT: [Basic.cluster_id], - SIG_EP_TYPE: BUTTON_DEVICE_TYPE, - SIG_EP_PROFILE: zigpy.profiles.zha.PROFILE_ID, - } - }, - model="lumi.sensor_switch.aq3", - manufacturer="LUMI", - quirk=SwitchAQ3, - ) - - assert isinstance(zigpy_device, SwitchAQ3) - - zha_device = await join_zigpy_device(zha_gateway, zigpy_device) - - ms_input_ch = zha_device.endpoints[1].all_cluster_handlers["1:0x0012"] - assert ms_input_ch is not None - - ms_input_ch.zha_send_event = MagicMock(wraps=ms_input_ch.zha_send_event) - - await send_attributes_report(zha_gateway, ms_input_ch.cluster, {0x0055: 0x01}) - - assert ms_input_ch.zha_send_event.call_count == 1 - assert ms_input_ch.zha_send_event.mock_calls == [ - call( - "single", - { - "value": 1.0, - }, - ) - ] - - zigpy_device = create_mock_zigpy_device( - zha_gateway, - { - 1: { - SIG_EP_INPUT: [ - Basic.cluster_id, - PowerConfiguration.cluster_id, - Identify.cluster_id, - PollControl.cluster_id, - TemperatureMeasurement.cluster_id, - Diagnostic.cluster_id, - ], - SIG_EP_OUTPUT: [ - Identify.cluster_id, - OnOff.cluster_id, - LevelControl.cluster_id, - Ota.cluster_id, - ], - SIG_EP_TYPE: zigpy.profiles.zha.DeviceType.LEVEL_CONTROL_SWITCH, - SIG_EP_PROFILE: zigpy.profiles.zha.PROFILE_ID, - } - }, - model="LIGHTIFY Dimming Switch", - manufacturer="OSRAM", - quirk=CentraLite3130, - ieee="00:15:8e:01:01:02:03:04", - ) - - assert isinstance(zigpy_device, CentraLite3130) - - zha_device = await join_zigpy_device(zha_gateway, zigpy_device) - - on_off_ch = zha_device.endpoints[1].client_cluster_handlers["1:0x0006_client"] - assert on_off_ch is not None - - on_off_ch.emit_zha_event = MagicMock(wraps=on_off_ch.emit_zha_event) - on_off_ch.emit_zha_event.reset_mock() - - on_off_ch.cluster_command(1, OnOff.ServerCommandDefs.on.id, []) - - assert on_off_ch.emit_zha_event.call_count == 2 - # attribute_updated is emitted first, then the cluster command is forwarded - assert on_off_ch.emit_zha_event.mock_calls == [ - call( - "attribute_updated", - { - "attribute_id": 0, - "attribute_name": "on_off", - "attribute_value": t.Bool.true, - "value": t.Bool.true, - }, - ), - call("on", []), - ] - on_off_ch.emit_zha_event.reset_mock() - - await send_attributes_report( - zha_gateway, on_off_ch.cluster, {OnOff.AttributeDefs.on_off.name: 0x01} - ) - - assert on_off_ch.emit_zha_event.call_count == 1 - assert on_off_ch.emit_zha_event.mock_calls == [ - call( - "attribute_updated", - { - "attribute_id": 0, - "attribute_name": "on_off", - "attribute_value": True, - "value": True, - }, - ) - ] - - on_off_ch.emit_zha_event.reset_mock() - - await send_attributes_report(zha_gateway, on_off_ch.cluster, {0x25: "Bar"}) - - assert on_off_ch.emit_zha_event.call_count == 1 - assert on_off_ch.emit_zha_event.mock_calls == [ - call( - "attribute_updated", - { - "attribute_id": 0x25, - "attribute_name": "Unknown", - "attribute_value": "Bar", - "value": "Bar", - }, - ) - ] - - -async def test_zdo_cluster_handler(zha_gateway: Gateway): - """Test that a quirk can send an event.""" - zigpy_device = create_mock_zigpy_device( - zha_gateway, - { - 1: { - SIG_EP_INPUT: [ - Basic.cluster_id, - PowerConfiguration.cluster_id, - OnOff.cluster_id, - MultistateInput.cluster_id, - ], - SIG_EP_OUTPUT: [Basic.cluster_id], - SIG_EP_TYPE: BUTTON_DEVICE_TYPE, - SIG_EP_PROFILE: zigpy.profiles.zha.PROFILE_ID, - } - }, - model="lumi.sensor_switch.aq3", - manufacturer="LUMI", - quirk=SwitchAQ3, - ) - - assert isinstance(zigpy_device, SwitchAQ3) - - zha_device = await join_zigpy_device(zha_gateway, zigpy_device) - - assert zha_device.zdo_cluster_handler is not None - assert zha_device.zdo_cluster_handler.status == ClusterHandlerStatus.INITIALIZED - assert zha_device.zdo_cluster_handler.cluster is not None - assert zha_device.zdo_cluster_handler.cluster == zigpy_device.endpoints[0] - assert ( - zha_device.zdo_cluster_handler.unique_id - == f"{str(zha_device.ieee)}:{zha_device.name}_ZDO" - ) diff --git a/tests/test_cover.py b/tests/test_cover.py index 565dd1dc3..a9a70f597 100644 --- a/tests/test_cover.py +++ b/tests/test_cover.py @@ -136,12 +136,7 @@ async def test_cover_non_tilt_initial_state( # pylint: disable=unused-argument ) cluster = zigpy_cover_device.endpoints[1].window_covering - assert ( - not zha_device.endpoints[1] - .all_cluster_handlers[f"1:0x{cluster.cluster_id:04x}"] - .inverted - ) - assert cluster.read_attributes.call_count == 3 + assert cluster.read_attributes.call_count == 2 assert ( WCAttrs.current_position_lift_percentage.name in cluster.read_attributes.call_args[0][0] @@ -184,12 +179,7 @@ async def test_cover_non_lift_initial_state( # pylint: disable=unused-argument ) cluster = zigpy_cover_device.endpoints[1].window_covering - assert ( - not zha_device.endpoints[1] - .all_cluster_handlers[f"1:0x{cluster.cluster_id:04x}"] - .inverted - ) - assert cluster.read_attributes.call_count == 3 + assert cluster.read_attributes.call_count == 2 assert ( WCAttrs.current_position_lift_percentage.name in cluster.read_attributes.call_args[0][0] @@ -232,12 +222,7 @@ async def test_cover( ) cluster = zigpy_cover_device.endpoints[1].window_covering - assert ( - not zha_device.endpoints[1] - .all_cluster_handlers[f"1:0x{cluster.cluster_id:04x}"] - .inverted - ) - assert cluster.read_attributes.call_count == 3 + assert cluster.read_attributes.call_count == 2 assert ( WCAttrs.current_position_lift_percentage.name in cluster.read_attributes.call_args[0][0] @@ -1084,9 +1069,7 @@ async def test_keen_vent( # open from client command fails p1 = patch.object(cluster_on_off, "request", side_effect=asyncio.TimeoutError) p2 = patch.object(cluster_level, "request", AsyncMock(return_value=[4, 0])) - p3 = pytest.raises( - ZHAException, match="Failed to send request: device did not respond" - ) + p3 = pytest.raises(asyncio.TimeoutError) with p1, p2, p3: await entity.async_open_cover() diff --git a/tests/test_device.py b/tests/test_device.py index b653ea89b..1c508a868 100644 --- a/tests/test_device.py +++ b/tests/test_device.py @@ -67,12 +67,10 @@ from zha.zigbee.group import Group, GroupMemberReference -def zigpy_device( - zha_gateway: Gateway, with_basic_cluster_handler: bool = True, **kwargs -): +def zigpy_device(zha_gateway: Gateway, with_basic_cluster: bool = True, **kwargs): """Return a ZigpyDevice with a switch cluster.""" in_clusters = [general.OnOff.cluster_id] - if with_basic_cluster_handler: + if with_basic_cluster: in_clusters.append(general.Basic.cluster_id) endpoints = { @@ -86,10 +84,10 @@ def zigpy_device( return create_mock_zigpy_device(zha_gateway, endpoints, **kwargs) -def zigpy_device_mains(zha_gateway: Gateway, with_basic_cluster_handler: bool = True): +def zigpy_device_mains(zha_gateway: Gateway, with_basic_cluster: bool = True): """Return a ZigpyDevice with a switch cluster.""" in_clusters = [general.OnOff.cluster_id] - if with_basic_cluster_handler: + if with_basic_cluster: in_clusters.append(general.Basic.cluster_id) endpoints = { @@ -130,41 +128,35 @@ async def _send_time_changed(zha_gateway: Gateway, seconds: int): await zha_gateway.async_block_till_done(wait_background_tasks=True) -@patch( - "zha.zigbee.cluster_handlers.general.BasicClusterHandler.async_initialize", - new=mock.AsyncMock(), -) async def test_check_available_success( zha_gateway: Gateway, caplog: pytest.LogCaptureFixture, ) -> None: """Check device availability success on 1st try.""" - device_with_basic_cluster_handler = zigpy_device_mains( - zha_gateway, with_basic_cluster_handler=True - ) - zha_device = await join_zigpy_device(zha_gateway, device_with_basic_cluster_handler) - basic_ch = device_with_basic_cluster_handler.endpoints[3].basic + device_with_basic_cluster = zigpy_device_mains(zha_gateway, with_basic_cluster=True) + zha_device = await join_zigpy_device(zha_gateway, device_with_basic_cluster) + basic_cluster = device_with_basic_cluster.endpoints[3].basic assert not zha_device.is_coordinator assert not zha_device.is_active_coordinator - basic_ch.read_attributes.reset_mock() - device_with_basic_cluster_handler.last_seen = None + basic_cluster.read_attributes.reset_mock() + device_with_basic_cluster.last_seen = None assert zha_device.available is True await _send_time_changed(zha_gateway, zha_device.consider_unavailable_time + 2) assert zha_device.available is False - assert basic_ch.read_attributes.await_count == 0 + assert basic_cluster.read_attributes.await_count == 0 - device_with_basic_cluster_handler.last_seen = ( + device_with_basic_cluster.last_seen = ( time.time() - zha_device.consider_unavailable_time - 100 ) - _seens = [time.time(), device_with_basic_cluster_handler.last_seen] + _seens = [time.time(), device_with_basic_cluster.last_seen] def _update_last_seen(*args, **kwargs): # pylint: disable=unused-argument new_last_seen = _seens.pop() - device_with_basic_cluster_handler.last_seen = new_last_seen + device_with_basic_cluster.last_seen = new_last_seen - basic_ch.read_attributes.side_effect = _update_last_seen + basic_cluster.read_attributes.side_effect = _update_last_seen for entity in zha_device.platform_entities.values(): entity.emit = mock.MagicMock(wraps=entity.emit) @@ -176,8 +168,8 @@ def _update_last_seen(*args, **kwargs): # pylint: disable=unused-argument await _send_time_changed( zha_gateway, zha_gateway._device_availability_checker.__polling_interval + 1 ) - assert basic_ch.read_attributes.await_count == 1 - assert basic_ch.read_attributes.await_args[0][0] == ["manufacturer"] + assert basic_cluster.read_attributes.await_count == 1 + assert basic_cluster.read_attributes.await_args[0][0] == ["manufacturer"] assert zha_device.available is False for entity in zha_device.platform_entities.values(): @@ -189,8 +181,8 @@ def _update_last_seen(*args, **kwargs): # pylint: disable=unused-argument await _send_time_changed( zha_gateway, zha_gateway._device_availability_checker.__polling_interval + 1 ) - assert basic_ch.read_attributes.await_count == 2 - assert basic_ch.read_attributes.await_args[0][0] == ["manufacturer"] + assert basic_cluster.read_attributes.await_count == 2 + assert basic_cluster.read_attributes.await_args[0][0] == ["manufacturer"] assert zha_device.available is False for entity in zha_device.platform_entities.values(): @@ -202,8 +194,8 @@ def _update_last_seen(*args, **kwargs): # pylint: disable=unused-argument await _send_time_changed( zha_gateway, zha_gateway._device_availability_checker.__polling_interval + 1 ) - assert basic_ch.read_attributes.await_count == 2 - assert basic_ch.read_attributes.await_args[0][0] == ["manufacturer"] + assert basic_cluster.read_attributes.await_count == 2 + assert basic_cluster.read_attributes.await_args[0][0] == ["manufacturer"] assert zha_device.available is True assert zha_device.on_network is True @@ -226,25 +218,19 @@ def _update_last_seen(*args, **kwargs): # pylint: disable=unused-argument entity.emit.reset_mock() -@patch( - "zha.zigbee.cluster_handlers.general.BasicClusterHandler.async_initialize", - new=mock.AsyncMock(), -) async def test_check_available_unsuccessful( zha_gateway: Gateway, ) -> None: """Check device availability all tries fail.""" - device_with_basic_cluster_handler = zigpy_device_mains( - zha_gateway, with_basic_cluster_handler=True - ) - zha_device = await join_zigpy_device(zha_gateway, device_with_basic_cluster_handler) - basic_ch = device_with_basic_cluster_handler.endpoints[3].basic + device_with_basic_cluster = zigpy_device_mains(zha_gateway, with_basic_cluster=True) + zha_device = await join_zigpy_device(zha_gateway, device_with_basic_cluster) + basic_cluster = device_with_basic_cluster.endpoints[3].basic assert zha_device.available is True - assert basic_ch.read_attributes.await_count == 0 + assert basic_cluster.read_attributes.await_count == 0 - device_with_basic_cluster_handler.last_seen = ( + device_with_basic_cluster.last_seen = ( time.time() - zha_device.consider_unavailable_time - 2 ) @@ -259,8 +245,8 @@ async def test_check_available_unsuccessful( zha_gateway, zha_gateway._device_availability_checker.__polling_interval + 1 ) - assert basic_ch.read_attributes.await_count == 1 - assert basic_ch.read_attributes.await_args[0][0] == ["manufacturer"] + assert basic_cluster.read_attributes.await_count == 1 + assert basic_cluster.read_attributes.await_args[0][0] == ["manufacturer"] assert zha_device.available is True for entity in zha_device.platform_entities.values(): @@ -273,8 +259,8 @@ async def test_check_available_unsuccessful( zha_gateway, zha_gateway._device_availability_checker.__polling_interval + 1 ) - assert basic_ch.read_attributes.await_count == 2 - assert basic_ch.read_attributes.await_args[0][0] == ["manufacturer"] + assert basic_cluster.read_attributes.await_count == 2 + assert basic_cluster.read_attributes.await_args[0][0] == ["manufacturer"] assert zha_device.available is True for entity in zha_device.platform_entities.values(): @@ -287,8 +273,8 @@ async def test_check_available_unsuccessful( zha_gateway, zha_gateway._device_availability_checker.__polling_interval + 1 ) - assert basic_ch.read_attributes.await_count == 2 - assert basic_ch.read_attributes.await_args[0][0] == ["manufacturer"] + assert basic_cluster.read_attributes.await_count == 2 + assert basic_cluster.read_attributes.await_args[0][0] == ["manufacturer"] assert zha_device.available is False for entity in zha_device.platform_entities.values(): @@ -297,27 +283,19 @@ async def test_check_available_unsuccessful( entity.emit.reset_mock() -@patch( - "zha.zigbee.cluster_handlers.general.BasicClusterHandler.async_initialize", - new=mock.AsyncMock(), -) -async def test_check_available_no_basic_cluster_handler( +async def test_check_available_no_basic_cluster( zha_gateway: Gateway, caplog: pytest.LogCaptureFixture, ) -> None: """Check device availability for a device without basic cluster.""" - device_without_basic_cluster_handler = zigpy_device( - zha_gateway, with_basic_cluster_handler=False - ) + device_without_basic = zigpy_device(zha_gateway, with_basic_cluster=False) caplog.set_level(logging.DEBUG, logger="homeassistant.components.zha") - zha_device = await join_zigpy_device( - zha_gateway, device_without_basic_cluster_handler - ) + zha_device = await join_zigpy_device(zha_gateway, device_without_basic) assert zha_device.available is True - device_without_basic_cluster_handler.last_seen = ( + device_without_basic.last_seen = ( time.time() - zha_device.consider_unavailable_time - 2 ) @@ -427,7 +405,7 @@ async def test_async_get_clusters( zha_gateway: Gateway, ) -> None: """Test async_get_clusters method.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) assert zha_device.async_get_clusters() == { @@ -449,7 +427,7 @@ async def test_async_get_groupable_endpoints( zha_gateway: Gateway, ) -> None: """Test async_get_groupable_endpoints method.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zigpy_dev.endpoints[3].add_input_cluster(general.Groups.cluster_id) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) @@ -460,7 +438,7 @@ async def test_async_get_std_clusters( zha_gateway: Gateway, ) -> None: """Test async_get_std_clusters method.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zigpy_dev.endpoints[3].profile_id = zigpy.profiles.zha.PROFILE_ID zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) @@ -483,7 +461,7 @@ async def test_async_get_cluster( zha_gateway: Gateway, ) -> None: """Test async_get_cluster method.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) assert zha_device.async_get_cluster(3, general.OnOff.cluster_id) == ( @@ -495,7 +473,7 @@ async def test_async_get_cluster_attributes( zha_gateway: Gateway, ) -> None: """Test async_get_cluster_attributes method.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) assert ( @@ -514,7 +492,7 @@ async def test_async_get_cluster_commands( zha_gateway: Gateway, ) -> None: """Test async_get_cluster_commands method.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) assert zha_device.async_get_cluster_commands(3, general.OnOff.cluster_id) == { @@ -527,7 +505,7 @@ async def test_write_zigbee_attribute( zha_gateway: Gateway, ) -> None: """Test write_zigbee_attribute method.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) with pytest.raises( @@ -587,7 +565,7 @@ async def test_issue_cluster_command( zha_gateway: Gateway, ) -> None: """Test issue_cluster_command method.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) with pytest.raises( @@ -623,7 +601,7 @@ async def test_async_add_to_group_remove_from_group( caplog: pytest.LogCaptureFixture, ) -> None: """Test async_add_to_group and async_remove_from_group methods.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zigpy_dev.endpoints[3].add_input_cluster(general.Groups.cluster_id) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) @@ -692,11 +670,11 @@ async def test_async_bind_to_group( caplog: pytest.LogCaptureFixture, ) -> None: """Test async_bind_to_group method.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zigpy_dev.endpoints[3].add_input_cluster(general.Groups.cluster_id) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) - zigpy_dev_remote = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev_remote = zigpy_device(zha_gateway, with_basic_cluster=True) zigpy_dev_remote._ieee = zigpy.types.EUI64.convert("00:0d:7f:00:0a:90:69:e8") zigpy_dev_remote.endpoints[3].add_output_cluster(general.OnOff.cluster_id) zha_device_remote = await join_zigpy_device(zha_gateway, zigpy_dev_remote) @@ -731,7 +709,7 @@ async def test_device_automation_triggers( zha_gateway: Gateway, ) -> None: """Test device automation triggers.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) assert get_device_automation_triggers(zha_device) == { @@ -748,7 +726,7 @@ async def test_device_properties( zha_gateway: Gateway, ) -> None: """Test device properties.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) assert zha_device.is_mains_powered is False @@ -771,8 +749,7 @@ async def test_device_properties( assert zha_device.model == "FakeModel" assert zha_device.is_groupable is False - assert zha_device.power_configuration_ch is None - assert zha_device.basic_ch is not None + assert zha_device.basic_cluster is not None assert zha_device.firmware_version is None assert len(zha_device.platform_entities) == 3 @@ -830,7 +807,7 @@ async def test_device_firmware_version_syncing(zha_gateway: Gateway) -> None: # If we update the entity, the device updates as well update_entity = get_entity(zha_device, platform=Platform.UPDATE) - update_entity._ota_cluster_handler.cluster.update_attribute( + update_entity._cluster.update_attribute( Ota.AttributeDefs.current_file_version.id, zigpy.types.uint32_t(0xABCD1234), ) @@ -838,7 +815,7 @@ async def test_device_firmware_version_syncing(zha_gateway: Gateway) -> None: assert zha_device.firmware_version == "0xabcd1234" # Duplicate updates are ignored - update_entity._ota_cluster_handler.cluster.update_attribute( + update_entity._cluster.update_attribute( Ota.AttributeDefs.current_file_version.id, zigpy.types.uint32_t(0xABCD1234), ) @@ -1028,7 +1005,12 @@ async def test_quirks_v2_prevent_default_entities(zha_gateway: Gateway) -> None: Platform.BUTTON, unique_id="00:0d:6f:00:05:65:83:f2-1-3" ) - assert len(zha_device.platform_entities) == 7 + non_virtual = [ + e + for e in zha_device.platform_entities.values() + if e.PLATFORM != Platform.VIRTUAL + ] + assert len(non_virtual) == 7 async def test_quirks_v2_change_entity_metadata(zha_gateway: Gateway) -> None: @@ -1061,6 +1043,23 @@ def filter_func(entity) -> bool: cluster_type=ClusterType.Server, new_primary=True, ) + # A generated quirks-v2 entity has no class-level `_cluster_match`, but + # does have a concrete backing cluster. A cluster_id-filtered metadata + # change must still reach it. + .sensor( + PowerConfiguration.AttributeDefs.battery_voltage.name, + PowerConfiguration.cluster_id, + translation_key="generated_battery_voltage", + fallback_name="Generated battery voltage", + unique_id_suffix="generated_battery_voltage", + ) + .change_entity_metadata( + endpoint_id=1, + cluster_id=PowerConfiguration.cluster_id, + cluster_type=ClusterType.Server, + unique_id_suffix="generated_battery_voltage", + new_translation_key="changed_via_cluster_id", + ) .add_to_registry() ) @@ -1095,6 +1094,13 @@ def filter_func(entity) -> bool: button_entity = get_entity(zha_device, platform=Platform.BUTTON) assert button_entity._attr_primary is True + # The cluster_id-filtered change must have reached the generated entity, + # even though it has no class-level `_cluster_match`. + generated_sensor = get_entity( + zha_device, platform=Platform.SENSOR, qualifier="generated_battery_voltage" + ) + assert generated_sensor._attr_translation_key == "changed_via_cluster_id" + async def test_quirks_v2_translation_placeholders(zha_gateway: Gateway) -> None: """Test quirks v2 translation_placeholders on entities.""" @@ -1197,7 +1203,7 @@ async def test_endpoint_none_profile( caplog: pytest.LogCaptureFixture, ) -> None: """Test endpoint with None profile id being skipped.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zigpy_dev.endpoints[3].profile_id = None zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) @@ -1205,6 +1211,180 @@ async def test_endpoint_none_profile( assert "Skipping endpoint, profile is None" in caplog.text +async def test_styrbar_press_events(zha_gateway: Gateway) -> None: + """Test that the STYRBAR `press` scene command becomes a well-formed zha_event.""" + + zigpy_dev = await zigpy_device_from_json( + zha_gateway.application_controller, + "tests/data/devices/ikea-of-sweden-remote-control-n2.json", + ) + + zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) + + listener = mock.Mock() + zha_device.on_all_events(listener) + + zigpy_dev.packet_received( + zigpy.types.ZigbeePacket( + src_ep=1, + dst_ep=1, + tsn=64, + profile_id=260, + cluster_id=5, + data=zigpy.types.SerializableBytes(b"\x05|\x11@\x07\x01\x01\r\x00"), + ) + ) + + assert listener.mock_calls == [ + call( + ZHAEvent( + device_ieee=zigpy.types.EUI64.convert("ab:cd:ef:12:6b:e7:d0:70"), + unique_id="ab:cd:ef:12:6b:e7:d0:70", + data={ + "unique_id": "ab:cd:ef:12:6b:e7:d0:70:1:0x0005_CLIENT", + "endpoint_id": 1, + "cluster_id": 5, + "command": "press", + "args": [257, 13, 0], + "params": {"param1": 257, "param2": 13, "param3": 0}, + }, + event_type="zha_event", + event="zha_event", + ) + ) + ] + + +async def test_unquirked_client_cluster_events(zha_gateway: Gateway) -> None: + """Test zha_events for OnOff/LevelControl client commands on a non-quirked remote.""" + + zigpy_dev = await zigpy_device_from_json( + zha_gateway.application_controller, + "tests/data/devices/innr-rc-250.json", + ) + zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) + + listener = mock.Mock() + zha_device.on_all_events(listener) + + # OnOff toggle (command_id=0x02, no args) + zigpy_dev.packet_received( + zigpy.types.ZigbeePacket( + src_ep=1, + dst_ep=1, + tsn=1, + profile_id=zigpy.profiles.zha.PROFILE_ID, + cluster_id=general.OnOff.cluster_id, + data=zigpy.types.SerializableBytes(b"\x01\x01\x02"), + ) + ) + + # LevelControl move(move_mode=Up, rate=50) (command_id=0x01) + zigpy_dev.packet_received( + zigpy.types.ZigbeePacket( + src_ep=1, + dst_ep=1, + tsn=2, + profile_id=zigpy.profiles.zha.PROFILE_ID, + cluster_id=general.LevelControl.cluster_id, + data=zigpy.types.SerializableBytes(b"\x01\x02\x01\x00\x32"), + ) + ) + + # LevelControl stop (command_id=0x03, no args) + zigpy_dev.packet_received( + zigpy.types.ZigbeePacket( + src_ep=1, + dst_ep=1, + tsn=3, + profile_id=zigpy.profiles.zha.PROFILE_ID, + cluster_id=general.LevelControl.cluster_id, + data=zigpy.types.SerializableBytes(b"\x01\x03\x03"), + ) + ) + + device_ieee = zigpy.types.EUI64.convert("ab:cd:ef:12:25:3a:b6:6f") + assert listener.mock_calls == [ + call( + ZHAEvent( + device_ieee=device_ieee, + unique_id="ab:cd:ef:12:25:3a:b6:6f", + data={ + "unique_id": "ab:cd:ef:12:25:3a:b6:6f:1:0x0006_CLIENT", + "endpoint_id": 1, + "cluster_id": general.OnOff.cluster_id, + "command": "attribute_updated", + "args": { + "attribute_id": 0, + "attribute_name": "on_off", + "attribute_value": True, + "value": True, + }, + "params": {}, + }, + event_type="zha_event", + event="zha_event", + ) + ), + call( + ZHAEvent( + device_ieee=device_ieee, + unique_id="ab:cd:ef:12:25:3a:b6:6f", + data={ + "unique_id": "ab:cd:ef:12:25:3a:b6:6f:1:0x0006_CLIENT", + "endpoint_id": 1, + "cluster_id": general.OnOff.cluster_id, + "command": "toggle", + "args": [], + "params": {}, + }, + event_type="zha_event", + event="zha_event", + ) + ), + call( + ZHAEvent( + device_ieee=device_ieee, + unique_id="ab:cd:ef:12:25:3a:b6:6f", + data={ + "unique_id": "ab:cd:ef:12:25:3a:b6:6f:1:0x0008_CLIENT", + "endpoint_id": 1, + "cluster_id": general.LevelControl.cluster_id, + "command": "move", + "args": [general.LevelControl.MoveMode.Up, 50], + "params": { + "move_mode": general.LevelControl.MoveMode.Up, + "rate": 50, + "options_mask": None, + "options_override": None, + }, + }, + event_type="zha_event", + event="zha_event", + ) + ), + call( + ZHAEvent( + device_ieee=device_ieee, + unique_id="ab:cd:ef:12:25:3a:b6:6f", + data={ + "unique_id": "ab:cd:ef:12:25:3a:b6:6f:1:0x0008_CLIENT", + "endpoint_id": 1, + "cluster_id": general.LevelControl.cluster_id, + "command": "stop", + "args": [], + "params": { + "options_mask": None, + "options_override": None, + }, + }, + event_type="zha_event", + event="zha_event", + ) + ), + ] + + async def test_somrig_events(zha_gateway: Gateway) -> None: """Test that Somrig events are handled correctly.""" @@ -1457,24 +1637,6 @@ async def test_remove_entity_no_event(zha_gateway: Gateway) -> None: assert event_listener.call_count == 0 -async def test_initialize_endpoint_failure(zha_gateway: Gateway) -> None: - """Test that a failing endpoint doesn't prevent device initialization.""" - zigpy_dev = await zigpy_device_from_json( - zha_gateway.application_controller, - "tests/data/devices/ikea-of-sweden-tradfri-bulb-gu10-ws-400lm.json", - ) - zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) - - with patch.object( - zha_device.endpoints[1], - "async_initialize", - side_effect=Exception("endpoint init failed"), - ) as mock_async_initialize: - await zha_device.async_initialize(from_cache=True) - - assert mock_async_initialize.call_count == 1 - - async def test_entity_recomputation(zha_gateway: Gateway) -> None: """Test entity recomputation.""" zigpy_dev = await zigpy_device_from_json( @@ -1569,7 +1731,7 @@ async def test_gateway_reconfigure_with_swap( zha_gateway: Gateway, ) -> None: """Test gateway.async_reinterview_device rebuilds when reinterview swaps.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) assert zha_device.status.name == "INITIALIZED" @@ -1621,9 +1783,10 @@ async def fake_reinterview(): patch.object(zha_device, "emit_reconfigure_done") as mock_emit, ): await zha_gateway.async_reinterview_device(zigpy_dev.ieee) - # On swap, async_reinterview_device must not emit reconfigure_done - # itself — the rebuild path emits via async_configure(). - assert mock_emit.call_count == 0 + await zha_gateway.async_block_till_done() + # On swap, the rebuild path emits reconfigure_done exactly once via + # async_configure() — async_reinterview_device does not emit itself. + assert mock_emit.call_count == 1 await zha_gateway.async_block_till_done() @@ -1646,7 +1809,7 @@ async def test_gateway_reconfigure_no_swap( zha_gateway: Gateway, ) -> None: """Test gateway.async_reinterview_device does normal configure when no swap.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) old_zigpy_dev = zha_device.device @@ -1674,7 +1837,7 @@ async def test_remove_entity_drops_mapping_on_on_remove_failure( would silently drop the replacement and the stale entity would shadow it indefinitely. """ - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) entity = next(iter(zha_device.platform_entities.values())) @@ -1701,7 +1864,7 @@ async def test_gateway_reconfigure_with_swap_rebuild_failure( is suppressed because entities are partial — reporting CONFIGURED would mislead the frontend's pairing-status display. """ - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) new_zigpy_dev = create_mock_zigpy_device( @@ -1748,7 +1911,7 @@ async def test_gateway_reconfigure_with_swap_initialize_failure( `async_initialize()` then raises, the gateway must NOT emit a second `reconfigure_done`. """ - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) new_zigpy_dev = create_mock_zigpy_device( @@ -1797,7 +1960,7 @@ async def test_gateway_reconfigure_reinterview_raises_still_emits( Without the `finally`, an exception left the HA frontend stuck on "reconfiguring" indefinitely. """ - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) with ( @@ -1818,7 +1981,7 @@ async def test_gateway_device_reinterviewed_ota_path( zha_gateway: Gateway, ) -> None: """Test that the gateway handles device_reinterviewed from OTA/zigpy.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) assert zha_device.status.name == "INITIALIZED" @@ -1856,7 +2019,7 @@ async def test_device_reinterviewed_cancels_pending_init_task( zha_gateway: Gateway, ) -> None: """Test that device_reinterviewed cancels an in-flight init task for the device.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) pending_task = mock.MagicMock() @@ -1899,7 +2062,7 @@ async def test_device_reinterviewed_configure_failure( zha_gateway: Gateway, caplog: pytest.LogCaptureFixture ) -> None: """Test that a configure failure during reinterview is logged but not raised.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) new_zigpy_dev = create_mock_zigpy_device( @@ -1947,7 +2110,7 @@ async def test_async_reinterview_device_active_coordinator( zha_gateway: Gateway, caplog: pytest.LogCaptureFixture ) -> None: """Test that async_reinterview_device skips the active coordinator.""" - zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster_handler=True) + zigpy_dev = zigpy_device(zha_gateway, with_basic_cluster=True) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) with ( diff --git a/tests/test_discover.py b/tests/test_discover.py index 30e3c7cbe..c8d69c970 100644 --- a/tests/test_discover.py +++ b/tests/test_discover.py @@ -3,6 +3,7 @@ import asyncio from collections import defaultdict from collections.abc import Callable +import contextlib import enum import json import pathlib @@ -59,9 +60,9 @@ from zha.application.gateway import Gateway from zha.application.helpers import DeviceOverridesConfiguration from zha.application.platforms import PlatformEntity, binary_sensor, sensor +from zha.application.platforms.const import PHILIPS_REMOTE_CLUSTER from zha.application.platforms.light import HueLight from zha.application.platforms.number import BaseNumber, NumberMode -from zha.zigbee.cluster_handlers.const import PHILLIPS_REMOTE_CLUSTER def _get_identify_cluster(zigpy_device): @@ -87,33 +88,19 @@ async def test_device_override( zha_device = await join_zigpy_device(zha_gateway, zigpy_device) - # The overridden entity exists - entity = get_entity( - zha_device, - platform=override_platform, - qualifier_func=( - lambda entity: ( - entity.cluster_handlers["on_off"].cluster - == zigpy_device.endpoints[1].on_off - ) - ), + # The overridden entity exists at the endpoint-level unique_id + entity = zha_device.get_platform_entity( + override_platform, unique_id=f"{zigpy_device.ieee}-1" ) assert entity is not None - assert entity.unique_id == f"{zigpy_device.ieee}-1" - # The original one does not + # The non-overridden platform has no such entity + other_platform = ( + Platform.LIGHT if override_platform == Platform.SWITCH else Platform.SWITCH + ) with pytest.raises(KeyError): - get_entity( - zha_device, - platform=( - Platform.LIGHT - if override_platform == Platform.SWITCH - else Platform.SWITCH - ), - qualifier_func=lambda entity: ( - entity.cluster_handlers["on_off"].cluster - == zigpy_device.endpoints[1].on_off - ), + zha_device.get_platform_entity( + other_platform, unique_id=f"{zigpy_device.ieee}-1" ) @@ -783,6 +770,45 @@ async def test_devices_from_files( await zha_device.on_remove() +async def test_skip_configuration_skips_bind_and_reporting( + zha_gateway: Gateway, +) -> None: + """A device marked skip_configuration must not have binds or reporting set up.""" + zigpy_device = await zigpy_device_from_json( + zha_gateway.application_controller, + "tests/data/devices/lumi-lumi-weather.json", + ) + assert zigpy_device.skip_configuration is True + + bind_mocks = [] + reporting_mocks = [] + with contextlib.ExitStack() as stack: + for ep in zigpy_device.non_zdo_endpoints: + for cluster in list(ep.in_clusters.values()) + list( + ep.out_clusters.values() + ): + bind_mocks.append( + stack.enter_context( + mock.patch.object(cluster, "bind", wraps=cluster.bind) + ) + ) + reporting_mocks.append( + stack.enter_context( + mock.patch.object( + cluster, + "configure_reporting_multiple", + wraps=cluster.configure_reporting_multiple, + ) + ) + ) + + zha_device = await join_zigpy_device(zha_gateway, zigpy_device) + await zha_device.async_configure() + + assert all(m.mock_calls == [] for m in bind_mocks) + assert all(m.mock_calls == [] for m in reporting_mocks) + + async def test_get_diagnostics_json_repeated_calls(zha_gateway: Gateway) -> None: """Test that calling get_diagnostics_json twice produces the same result.""" zigpy_device = await zigpy_device_from_json( @@ -849,16 +875,18 @@ async def test_diagnostics_omits_ota_last_query_cmd_when_none( assert "last_query_cmd" not in ota_diag -async def test_cluster_handler_only_clusters_are_bound(zha_gateway: Gateway) -> None: - """Test CLUSTER_HANDLER_ONLY_CLUSTERS causes binds even without entities.""" +async def test_entityless_cluster_binds_via_virtual_entity( + zha_gateway: Gateway, +) -> None: + """Manufacturer clusters that don't produce entities are still bound.""" zigpy_device = await zigpy_device_from_json( zha_gateway.application_controller, "tests/data/devices/signify-netherlands-b-v-rwl022.json", ) - # The Philips remote cluster (0xFC00) is in CLUSTER_HANDLER_ONLY_CLUSTERS: it - # doesn't produce any entities but must still be bound - philips_cluster = zigpy_device.endpoints[1].in_clusters[PHILLIPS_REMOTE_CLUSTER] + # The Philips remote cluster (0xFC00) has no HA entity but `PhilipsRemoteBind` + # virtual entity binds it so the device can send commands to the coordinator. + philips_cluster = zigpy_device.endpoints[1].in_clusters[PHILIPS_REMOTE_CLUSTER] await join_zigpy_device(zha_gateway, zigpy_device) await zha_gateway.async_block_till_done(wait_background_tasks=True) diff --git a/tests/test_fan.py b/tests/test_fan.py index 9d53226f2..5b13540a8 100644 --- a/tests/test_fan.py +++ b/tests/test_fan.py @@ -43,7 +43,6 @@ SPEED_OFF, ) from zha.application.platforms.fan.helpers import NotValidPresetModeError -from zha.exceptions import ZHAException from zha.zigbee.device import Device from zha.zigbee.group import Group, GroupMemberReference @@ -272,7 +271,7 @@ async def async_set_preset_mode( @patch( "zigpy.zcl.clusters.hvac.Fan.write_attributes", - new=AsyncMock(return_value=zcl_f.WriteAttributesResponse.deserialize(b"\x00")[0]), + new=AsyncMock(return_value=[zcl_f.WriteAttributesResponse.deserialize(b"\x00")[0]]), ) async def test_zha_group_fan_entity( zha_gateway: Gateway, @@ -424,7 +423,7 @@ async def test_zha_group_fan_entity_failure_state( # turn on from client group_fan_cluster.write_attributes.reset_mock() - with pytest.raises(ZHAException, match="Failed to send request"): + with pytest.raises(ZigbeeException): await async_turn_on(zha_gateway, entity) await zha_gateway.async_block_till_done() assert len(group_fan_cluster.write_attributes.mock_calls) == 1 diff --git a/tests/test_gateway.py b/tests/test_gateway.py index 7802c3f40..f54558565 100644 --- a/tests/test_gateway.py +++ b/tests/test_gateway.py @@ -610,23 +610,36 @@ async def test_gateway_device_reinterviewed_no_bookkeeping_loss_on_rapid_event( in-flight task. """ zigpy_dev = create_mock_zigpy_device(zha_gateway, ZIGPY_DEVICE_BASIC) - await join_zigpy_device(zha_gateway, zigpy_dev) + zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) + + # Keep the replacement task in-flight by stalling configure on an event + # we control. Without this, the reinterview task completes synchronously + # under eager_start and exits the dict before we get to assert. + proceed = asyncio.Event() + original_configure = zha_device.async_configure + + async def stalled_configure() -> None: + await proceed.wait() + await original_configure() + + with patch.object(zha_device, "async_configure", side_effect=stalled_configure): + zha_gateway.device_reinterviewed(zigpy_dev) + task_1 = zha_gateway._device_init_tasks[zigpy_dev.ieee] - zha_gateway.device_reinterviewed(zigpy_dev) - task_1 = zha_gateway._device_init_tasks[zigpy_dev.ieee] + zha_gateway.device_reinterviewed(zigpy_dev) + task_2 = zha_gateway._device_init_tasks[zigpy_dev.ieee] + assert task_2 is not task_1 - zha_gateway.device_reinterviewed(zigpy_dev) - task_2 = zha_gateway._device_init_tasks[zigpy_dev.ieee] - assert task_2 is not task_1 + # Let task_1's cancellation propagate and its done-callback run. + with suppress(asyncio.CancelledError): + await task_1 + await asyncio.sleep(0) - # Let task_1's cancellation propagate and its done-callback run. - with suppress(asyncio.CancelledError): - await task_1 - await asyncio.sleep(0) + # The cancelled task's done-callback must not have cleared the dict; + # the replacement task is still in flight. + assert zha_gateway._device_init_tasks.get(zigpy_dev.ieee) is task_2 - # The cancelled task's done-callback must not have cleared the dict; - # the replacement task is still in flight. - assert zha_gateway._device_init_tasks.get(zigpy_dev.ieee) is task_2 + proceed.set() await zha_gateway.async_block_till_done() assert zigpy_dev.ieee not in zha_gateway._device_init_tasks diff --git a/tests/test_light.py b/tests/test_light.py index b59e452ce..a7dcc4419 100644 --- a/tests/test_light.py +++ b/tests/test_light.py @@ -1577,18 +1577,18 @@ async def test_transitions( await entity.async_turn_on(transition=1, brightness=25, color_temp=235) await zha_gateway.async_block_till_done() - group_on_off_cluster_handler = zha_group.endpoint[general.OnOff.cluster_id] - group_level_cluster_handler = zha_group.endpoint[general.LevelControl.cluster_id] - group_color_cluster_handler = zha_group.endpoint[lighting.Color.cluster_id] - assert group_on_off_cluster_handler.request.call_count == 0 - assert group_on_off_cluster_handler.request.await_count == 0 - assert group_color_cluster_handler.request.call_count == 1 - assert group_color_cluster_handler.request.await_count == 1 - assert group_level_cluster_handler.request.call_count == 1 - assert group_level_cluster_handler.request.await_count == 1 + group_on_off_cluster = zha_group.endpoint[general.OnOff.cluster_id] + group_level_cluster = zha_group.endpoint[general.LevelControl.cluster_id] + group_color_cluster = zha_group.endpoint[lighting.Color.cluster_id] + assert group_on_off_cluster.request.call_count == 0 + assert group_on_off_cluster.request.await_count == 0 + assert group_color_cluster.request.call_count == 1 + assert group_color_cluster.request.await_count == 1 + assert group_level_cluster.request.call_count == 1 + assert group_level_cluster.request.await_count == 1 # groups are omitted from the 3 call dance for new_color_provided_while_off - assert group_color_cluster_handler.request.call_args == call( + assert group_color_cluster.request.call_args == call( False, dev2_cluster_color.commands_by_name["move_to_color_temp"].id, dev2_cluster_color.commands_by_name["move_to_color_temp"].schema, @@ -1597,7 +1597,7 @@ async def test_transitions( expect_reply=True, manufacturer=None, ) - assert group_level_cluster_handler.request.call_args == call( + assert group_level_cluster.request.call_args == call( False, dev2_cluster_level.commands_by_name["move_to_level_with_on_off"].id, dev2_cluster_level.commands_by_name["move_to_level_with_on_off"].schema, @@ -1612,9 +1612,9 @@ async def test_transitions( assert entity.state["color_temp"] == 235 assert entity.state["color_mode"] == ColorMode.COLOR_TEMP - group_on_off_cluster_handler.request.reset_mock() - group_color_cluster_handler.request.reset_mock() - group_level_cluster_handler.request.reset_mock() + group_on_off_cluster.request.reset_mock() + group_color_cluster.request.reset_mock() + group_level_cluster.request.reset_mock() # turn the sengled light back on await device_2_light_entity.async_turn_on() diff --git a/tests/test_number.py b/tests/test_number.py index bca2ef1ab..e49478d27 100644 --- a/tests/test_number.py +++ b/tests/test_number.py @@ -26,7 +26,6 @@ from zha.application.gateway import Gateway from zha.application.platforms import EntityCategory, PlatformEntity from zha.application.platforms.number.const import NumberMode -from zha.exceptions import ZHAException ZIGPY_ANALOG_OUTPUT_DEVICE = { 1: { @@ -104,7 +103,7 @@ async def test_number( zha_device = await join_zigpy_device(zha_gateway, zigpy_analog_output_device) # one for present_value and one for the rest configuration attributes - assert cluster.read_attributes.call_count == 3 + assert cluster.read_attributes.call_count == 2 attr_reads = set() for call_args in cluster.read_attributes.call_args_list: attr_reads |= set(call_args[0][0]) @@ -119,7 +118,7 @@ async def test_number( entity: PlatformEntity = get_entity(zha_device, platform=Platform.NUMBER) assert isinstance(entity, PlatformEntity) - assert cluster.read_attributes.call_count == 3 + assert cluster.read_attributes.call_count == 2 assert entity.fallback_name == "PWM1" @@ -139,7 +138,7 @@ async def test_number( assert entity.native_step == 1.1 # change value from device - assert cluster.read_attributes.call_count == 3 + assert cluster.read_attributes.call_count == 2 await send_attributes_report(zha_gateway, cluster, {0x0055: 15}) await zha_gateway.async_block_till_done() assert entity.state["state"] == 15.0 @@ -245,16 +244,10 @@ async def test_level_control_number( "on_transition_time", "off_transition_time", "default_move_rate", + "start_up_current_level", ], allow_cache=True, only_cache=False, - manufacturer=UNDEFINED, - ), - call( - ["start_up_current_level"], - allow_cache=True, - only_cache=False, - manufacturer=UNDEFINED, ), call( [ @@ -262,7 +255,6 @@ async def test_level_control_number( ], allow_cache=False, only_cache=False, - manufacturer=UNDEFINED, ), ] @@ -300,13 +292,11 @@ async def test_level_control_number( level_control_cluster.write_attributes.reset_mock() level_control_cluster.write_attributes.side_effect = ZigbeeException - with pytest.raises(ZHAException): + with pytest.raises(ZigbeeException): await entity.async_set_native_value(new_value) assert level_control_cluster.write_attributes.mock_calls == [ call({attr: new_value}, manufacturer=UNDEFINED), - call({attr: new_value}, manufacturer=UNDEFINED), - call({attr: new_value}, manufacturer=UNDEFINED), ] assert entity.state["state"] == initial_value @@ -372,7 +362,6 @@ async def test_color_number( ], allow_cache=True, only_cache=False, - manufacturer=UNDEFINED, ) in color_cluster.read_attributes.call_args_list ) @@ -406,13 +395,11 @@ async def test_color_number( color_cluster.write_attributes.reset_mock() color_cluster.write_attributes.side_effect = ZigbeeException - with pytest.raises(ZHAException): + with pytest.raises(ZigbeeException): await entity.async_set_native_value(new_value) assert color_cluster.write_attributes.mock_calls == [ call({attr: new_value}, manufacturer=UNDEFINED), - call({attr: new_value}, manufacturer=UNDEFINED), - call({attr: new_value}, manufacturer=UNDEFINED), ] assert entity.state["state"] == initial_value diff --git a/tests/test_sensor.py b/tests/test_sensor.py index 4e37b21d2..14587a60a 100644 --- a/tests/test_sensor.py +++ b/tests/test_sensor.py @@ -4,9 +4,8 @@ from collections.abc import Awaitable, Callable from datetime import UTC, datetime from functools import partial -import math from typing import Any -from unittest.mock import AsyncMock, MagicMock, patch +from unittest.mock import MagicMock, call, patch import pytest from zhaquirks.danfoss import thermostat as danfoss_thermostat @@ -14,13 +13,17 @@ from zigpy.profiles import zha import zigpy.profiles.zha from zigpy.quirks import CustomCluster, DeviceRegistry, get_device -from zigpy.quirks.v2 import CustomDeviceV2, QuirkBuilder, ReportingConfig +from zigpy.quirks.v2 import ( + CustomDeviceV2, + QuirkBuilder, + ReportingConfig as QuirksReportingConfig, +) from zigpy.quirks.v2.homeassistant import EntityPlatform, EntityType, UnitOfMass from zigpy.quirks.v2.homeassistant.sensor import ( SensorDeviceClass as SensorDeviceClassV2, ) import zigpy.types as t -from zigpy.zcl import Cluster +from zigpy.zcl import Cluster, ReportingConfig from zigpy.zcl.clusters import general, homeautomation, hvac, measurement, smartenergy from zigpy.zcl.clusters.general import AnalogInput, PowerConfiguration from zigpy.zcl.clusters.general_const import AnalogInputType, ApplicationType @@ -34,11 +37,11 @@ create_mock_zigpy_device, get_entity, join_zigpy_device, + patch_cluster_for_testing, send_attributes_report, zigpy_device_from_json, ) from zha.application import Platform -from zha.application.const import ZCL_INIT_ATTRS, ZHA_CLUSTER_HANDLER_READS_PER_REQ from zha.application.gateway import Gateway from zha.application.platforms import PlatformEntity, sensor from zha.application.platforms.sensor import ( @@ -55,8 +58,6 @@ UnitOfPressure, UnitOfVolume, ) -from zha.zigbee.cluster_handlers import AttrReportConfig -from zha.zigbee.cluster_handlers.manufacturerspecific import OppleRemoteClusterHandler from zha.zigbee.device import Device EMAttrs = homeautomation.ElectricalMeasurement.AttributeDefs @@ -607,7 +608,7 @@ async def async_test_em_dc_power( ), ( homeautomation.ElectricalMeasurement.cluster_id, - sensor.PolledElectricalMeasurement, + sensor.ElectricalMeasurementActivePower, async_test_electrical_measurement, {"ac_power_divisor": 1000, "ac_power_multiplier": 1}, {"apparent_power", "rms_current", "rms_voltage"}, @@ -892,10 +893,7 @@ def assert_state(entity: PlatformEntity, state: Any, unit_of_measurement: str) - assert entity.info_object.unit == unit_of_measurement -async def test_electrical_measurement_init( - zha_gateway: Gateway, - caplog: pytest.LogCaptureFixture, -) -> None: +async def test_electrical_measurement_init(zha_gateway: Gateway) -> None: """Test proper initialization of the electrical measurement cluster.""" cluster_id = homeautomation.ElectricalMeasurement.cluster_id @@ -917,7 +915,7 @@ async def test_electrical_measurement_init( entity = get_entity( zha_device, platform=Platform.SENSOR, - exact_entity_type=sensor.PolledElectricalMeasurement, + exact_entity_type=sensor.ElectricalMeasurementActivePower, ) await send_attributes_report( @@ -927,83 +925,20 @@ async def test_electrical_measurement_init( ) assert entity.state["state"] == 100 - cluster_handler = list(zha_device._endpoints.values())[0].all_cluster_handlers[ - "1:0x0b04" - ] - assert cluster_handler.ac_power_divisor == 1 - assert cluster_handler.ac_power_multiplier == 1 - - # update power divisor - await send_attributes_report( - zha_gateway, - cluster, - {EMAttrs.active_power.id: 20, EMAttrs.power_divisor.id: 5}, - ) - assert cluster_handler.ac_power_divisor == 5 - assert cluster_handler.ac_power_multiplier == 1 - assert entity.state["state"] == 4.0 - - zha_device.on_network = False - - await asyncio.sleep(entity.__polling_interval + 1) - await zha_gateway.async_block_till_done(wait_background_tasks=True) - assert ( - "-1-2820: skipping polling for updated state, available: False, allow polled requests: True" - in caplog.text - ) - - zha_device.on_network = True - await send_attributes_report( zha_gateway, cluster, {EMAttrs.active_power.id: 30, EMAttrs.ac_power_divisor.id: 10}, ) - assert cluster_handler.ac_power_divisor == 10 - assert cluster_handler.ac_power_multiplier == 1 assert entity.state["state"] == 3.0 - # update power multiplier - await send_attributes_report( - zha_gateway, - cluster, - {EMAttrs.active_power.id: 20, EMAttrs.power_multiplier.id: 6}, - ) - assert cluster_handler.ac_power_divisor == 10 - assert cluster_handler.ac_power_multiplier == 6 - assert entity.state["state"] == 12.0 - await send_attributes_report( zha_gateway, cluster, {EMAttrs.active_power.id: 30, EMAttrs.ac_power_multiplier.id: 20}, ) - assert cluster_handler.ac_power_divisor == 10 - assert cluster_handler.ac_power_multiplier == 20 assert entity.state["state"] == 60.0 - entity._refresh = AsyncMock(wraps=entity._refresh) - - assert entity._refresh.await_count == 0 - - entity.disable() - - assert entity.enabled is False - - await asyncio.sleep(entity.__polling_interval + 1) - await zha_gateway.async_block_till_done(wait_background_tasks=True) - - assert entity._refresh.await_count == 0 - - entity.enable() - - assert entity.enabled is True - - await asyncio.sleep(entity.__polling_interval + 1) - await zha_gateway.async_block_till_done(wait_background_tasks=True) - - assert entity._refresh.await_count == 1 - @pytest.mark.parametrize( ( @@ -1021,7 +956,7 @@ async def test_electrical_measurement_init( "rms_current", }, { - sensor.PolledElectricalMeasurement, + sensor.ElectricalMeasurementActivePower, sensor.ElectricalMeasurementFrequency, sensor.ElectricalMeasurementPowerFactor, }, @@ -1041,7 +976,7 @@ async def test_electrical_measurement_init( }, { sensor.ElectricalMeasurementRMSVoltage, - sensor.PolledElectricalMeasurement, + sensor.ElectricalMeasurementActivePower, }, { sensor.ElectricalMeasurementApparentPower, @@ -1055,7 +990,7 @@ async def test_electrical_measurement_init( set(), { sensor.ElectricalMeasurementRMSVoltage, - sensor.PolledElectricalMeasurement, + sensor.ElectricalMeasurementActivePower, sensor.ElectricalMeasurementApparentPower, sensor.ElectricalMeasurementRMSCurrent, sensor.ElectricalMeasurementFrequency, @@ -1322,7 +1257,7 @@ async def test_elec_measurement_sensor_polling(zha_gateway: Gateway) -> None: entity = get_entity( zha_dev, platform=Platform.SENSOR, - exact_entity_type=sensor.PolledElectricalMeasurement, + exact_entity_type=sensor.ElectricalMeasurementActivePower, ) assert entity.state["state"] == 2.0 @@ -1356,7 +1291,7 @@ async def test_metering_sensor_polling(zha_gateway: Gateway) -> None: entity = get_entity( zha_dev, platform=Platform.SENSOR, - exact_entity_type=sensor.PolledSmartEnergySummation, + exact_entity_type=sensor.SmartEnergySummation, ) assert entity.state["state"] == 2.0 @@ -1380,29 +1315,10 @@ async def test_metering_sensor_polling(zha_gateway: Gateway) -> None: "supported_attributes", ( set(), - { - "active_power", - "active_power_max", - "rms_current", - "rms_current_max", - "rms_voltage", - "rms_voltage_max", - }, - { - "active_power", - }, - { - "active_power", - "active_power_max", - }, - { - "rms_current", - "rms_current_max", - }, - { - "rms_voltage", - "rms_voltage_max", - }, + {"active_power", "rms_current", "rms_voltage"}, + {"active_power"}, + {"rms_current"}, + {"rms_voltage"}, ), ) async def test_elec_measurement_skip_unsupported_attribute( @@ -1442,6 +1358,8 @@ async def test_elec_measurement_skip_unsupported_attribute( "power_factor_ph_c", "ac_frequency", "ac_frequency_max", + "ac_frequency_divisor", + "ac_frequency_multiplier", "ac_voltage_divisor", "ac_current_divisor", "ac_power_divisor", @@ -1450,6 +1368,7 @@ async def test_elec_measurement_skip_unsupported_attribute( "ac_current_multiplier", "power_divisor", "power_multiplier", + "measurement_type", "dc_voltage", "dc_voltage_divisor", "dc_voltage_multiplier", @@ -1464,16 +1383,14 @@ async def test_elec_measurement_skip_unsupported_attribute( cluster.add_unsupported_attribute(attr) cluster.read_attributes.reset_mock() - entity = get_entity( + poller = get_entity( zha_dev, - platform=Platform.SENSOR, - exact_entity_type=sensor.PolledElectricalMeasurement, + platform=Platform.VIRTUAL, + exact_entity_type=sensor.ElectricalMeasurementPoller, ) - await entity.async_update() + await poller.async_update() await zha_dev.gateway.async_block_till_done() - assert cluster.read_attributes.call_count == math.ceil( - len(supported_attributes) / ZHA_CLUSTER_HANDLER_READS_PER_REQ - ) + read_attrs = { a for call in cluster.read_attributes.call_args_list for a in call[0][0] } @@ -1577,7 +1494,7 @@ def __init__(self, *args, **kwargs) -> None: unit=UnitOfMass.GRAMS, translation_key="last_feeding_size", fallback_name="Last feeding size", - reporting_config=ReportingConfig( + reporting_config=QuirksReportingConfig( min_interval=0, max_interval=60, reportable_change=1 ), ) @@ -1688,59 +1605,43 @@ async def test_state_class( assert "Quirks provided an invalid state class: energy" in caplog.text -async def test_cluster_handler_quirks_attribute_reporting(zha_gateway: Gateway) -> None: - """Test quirks sensor setting up ZCL_INIT_ATTRS and REPORT_CONFIG correctly.""" - - # Suppress normal endpoint probing, as this will claim the Opple cluster handler - # already due to it being in the "CLUSTER_HANDLER_ONLY_CLUSTERS" registry. - # We want to test the handler also gets claimed via quirks v2 reporting config. +async def test_quirks_v2_sensor_reporting_configures_cluster( + zha_gateway: Gateway, +) -> None: + """A quirks v2 sensor with reporting_config binds the cluster and configures reporting.""" + # Suppress normal endpoint probing so that virtual entities for the Opple + # cluster (e.g. AqaraOppleBind) don't bind it themselves — we want to + # observe the bind triggered by the quirks v2 sensor's reporting config. with patch("zha.application.discovery.discover_entities_for_endpoint"): - zha_device, cluster = await zigpy_device_aqara_sensor_v2_mock(zha_gateway) + zha_device, opple_cluster = await zigpy_device_aqara_sensor_v2_mock(zha_gateway) assert isinstance(zha_device.device, CustomDeviceV2) - # get cluster handler of OppleCluster - opple_ch = zha_device.endpoints[1].all_cluster_handlers["1:0xfcc0"] - assert isinstance(opple_ch, OppleRemoteClusterHandler) - - # make sure the cluster handler was claimed due to reporting config, so ZHA binds it - assert opple_ch in zha_device.endpoints[1].claimed_cluster_handlers.values() - - # check that BIND is not set to False, as reporting is configured - assert opple_ch.BIND is True - - # check ZCL_INIT_ATTRS contains sensor attributes that are not in REPORT_CONFIG - assert opple_ch.ZCL_INIT_ATTRS == { - "energy": True, - "energy_delivered": True, - "energy_invalid_state_class": True, - "power": True, - } - # check that ZCL_INIT_ATTRS is an instance variable and not a class variable now - assert opple_ch.ZCL_INIT_ATTRS is opple_ch.__dict__[ZCL_INIT_ATTRS] - assert opple_ch.ZCL_INIT_ATTRS is not OppleRemoteClusterHandler.ZCL_INIT_ATTRS + # The quirks v2 sensor entity is created + last_feeding_size = get_entity( + zha_device, platform=Platform.SENSOR, qualifier="last_feeding_size" + ) + assert last_feeding_size is not None - # double check we didn't modify the class variable - assert OppleRemoteClusterHandler.ZCL_INIT_ATTRS == {} + # The reporting_config attached to the sensor causes a bind + configure_reporting + assert len(opple_cluster.bind.mock_calls) == 1 - # check if REPORT_CONFIG is set correctly - assert ( - ( - AttrReportConfig( - attr="last_feeding_size", - config=(0, 60, 1), - ), + last_feeding_size_def = opple_cluster.find_attribute("last_feeding_size") + assert opple_cluster.configure_reporting_multiple.mock_calls == [ + call( + { + last_feeding_size_def: ReportingConfig( + min_interval=0, max_interval=60, reportable_change=1 + ), + } ) - ) == opple_ch.REPORT_CONFIG - - # this cannot be wrong, as REPORT_CONFIG is an immutable tuple and not a list/dict, - # but let's check it anyway in case the type changes in the future - assert opple_ch.REPORT_CONFIG is not OppleRemoteClusterHandler.REPORT_CONFIG - assert OppleRemoteClusterHandler.REPORT_CONFIG == () + ] -async def test_cluster_handler_quirks_attribute_reading(zha_gateway: Gateway) -> None: - """Test quirks sensor setting up ZCL_INIT_ATTRS, claiming cluster handler.""" +async def test_quirks_v2_sensor_attribute_init_reads_cluster( + zha_gateway: Gateway, +) -> None: + """A quirks v2 sensor without reporting_config reads its attribute but doesn't bind.""" registry = DeviceRegistry() ( @@ -1774,40 +1675,36 @@ async def test_cluster_handler_quirks_attribute_reading(zha_gateway: Gateway) -> model="Fake_Model_sensor_2", ) zigpy_device = registry.get_device(zigpy_device) - - # Suppress normal endpoint probing, as this will claim the Opple cluster handler - # already due to it being in the "CLUSTER_HANDLER_ONLY_CLUSTERS" registry. - # We want to test the handler also gets claimed via quirks v2 attributes init. + # `registry.get_device` swaps in the replaced OppleCluster instance; patch its + # network methods so we can assert bind/reporting/reading behavior. + opple_cluster = zigpy_device.endpoints[1].opple_cluster + patch_cluster_for_testing(opple_cluster) + + # Suppress normal endpoint probing so virtual entities for the Opple cluster + # (e.g. AqaraOppleBind) don't bind it themselves — we want to observe only + # the quirks v2 sensor's effect. with patch("zha.application.discovery.discover_entities_for_endpoint"): zha_device = await join_zigpy_device(zha_gateway, zigpy_device) assert isinstance(zha_device.device, CustomDeviceV2) - # get cluster handler of OppleCluster - opple_ch = zha_device.endpoints[1].all_cluster_handlers["1:0xfcc0"] - assert isinstance(opple_ch, OppleRemoteClusterHandler) - - # make sure the cluster handler was claimed due to attributes to be initialized - # otherwise, ZHA won't configure the cluster handler, so attributes are not read - assert opple_ch in zha_device.endpoints[1].claimed_cluster_handlers.values() - - # check that BIND is set to False, as no reporting is configured - assert opple_ch.BIND is False - - # check ZCL_INIT_ATTRS contains sensor attributes that are not in REPORT_CONFIG - assert opple_ch.ZCL_INIT_ATTRS == { - "last_feeding_size": True, - } - # check that ZCL_INIT_ATTRS is an instance variable and not a class variable now - assert opple_ch.ZCL_INIT_ATTRS is opple_ch.__dict__[ZCL_INIT_ATTRS] - assert opple_ch.ZCL_INIT_ATTRS is not OppleRemoteClusterHandler.ZCL_INIT_ATTRS + # The quirks v2 sensor entity is created + last_feeding_size = get_entity( + zha_device, platform=Platform.SENSOR, qualifier="last_feeding_size" + ) + assert last_feeding_size is not None - # double check we didn't modify the class variable - assert OppleRemoteClusterHandler.ZCL_INIT_ATTRS == {} + # No reporting config -> no bind, no configure_reporting + assert len(opple_cluster.bind.mock_calls) == 0 + assert len(opple_cluster.configure_reporting_multiple.mock_calls) == 0 - # check if REPORT_CONFIG is empty, both instance and class variable - assert opple_ch.REPORT_CONFIG == () - assert OppleRemoteClusterHandler.REPORT_CONFIG == () + # But the attribute IS read on startup so the sensor has an initial value + attr_reads = [ + c + for c in opple_cluster.read_attributes.mock_calls + if c.args and "last_feeding_size" in c.args[0] + ] + assert len(attr_reads) == 1 async def test_device_counter_sensors(zha_gateway: Gateway) -> None: @@ -2217,10 +2114,10 @@ async def test_enum_sensor(zha_gateway: Gateway) -> None: assert entity.state["state"] == "undefined_0xab" # TODO: should this be `None`? -async def test_ubisys_polled_em_keeps_polling_when_disabled( +async def test_em_poller_runs_independently_of_entity_enabled_state( zha_gateway: Gateway, ) -> None: - """Test that UbisysPolledElectricalMeasurement keeps polling when disabled.""" + """Disabling the active_power entity must not stop EM cluster polling.""" zigpy_dev = await zigpy_device_from_json( zha_gateway.application_controller, @@ -2228,29 +2125,25 @@ async def test_ubisys_polled_em_keeps_polling_when_disabled( ) zha_device = await join_zigpy_device(zha_gateway, zigpy_dev) - entity = get_entity( + poller = get_entity( + zha_device, + platform=Platform.VIRTUAL, + exact_entity_type=sensor.ElectricalMeasurementPoller, + ) + active_power = get_entity( zha_device, platform=Platform.SENSOR, - exact_entity_type=sensor.UbisysPolledElectricalMeasurement, + exact_entity_type=sensor.ElectricalMeasurementActivePower, ) - assert isinstance(entity, sensor.UbisysPolledElectricalMeasurement) - assert entity._use_custom_polling is True - assert entity._polling_task is not None - assert entity.enabled is True + assert len(poller._tracked_tasks) == 1 + poll_task = poller._tracked_tasks[0] + assert not poll_task.done() - # Disable the entity (simulating what the quirk does) - entity.disable() + active_power.disable() + assert active_power.enabled is False + assert not poll_task.done() - assert entity.enabled is False - # Polling task must still be running - assert entity._polling_task is not None - assert not entity._polling_task.done() - - # Re-enable the entity - entity.enable() - - assert entity.enabled is True - # Polling task must still be running (no duplicate created) - assert entity._polling_task is not None - assert not entity._polling_task.done() + active_power.enable() + assert active_power.enabled is True + assert not poll_task.done() diff --git a/tests/test_siren.py b/tests/test_siren.py index f8161b2b6..19f8c2e82 100644 --- a/tests/test_siren.py +++ b/tests/test_siren.py @@ -76,10 +76,11 @@ async def test_siren(zha_gateway: Gateway) -> None: assert len(cluster.request.mock_calls) == 1 assert cluster.request.call_args[0][0] is False assert cluster.request.call_args[0][1] == 0 - assert cluster.request.call_args[0][3] == 50 # bitmask for default args - assert cluster.request.call_args[0][4] == 5 # duration in seconds - assert cluster.request.call_args[0][5] == 0 - assert cluster.request.call_args[0][6] == 2 + kw = cluster.request.call_args.kwargs + assert kw["warning"] == 50 # bitmask for default args + assert kw["warning_duration"] == 5 # duration in seconds + assert kw["strobe_duty_cycle"] == 0 + assert kw["stobe_level"] == 2 cluster.request.reset_mock() # test that the state has changed to on @@ -95,10 +96,11 @@ async def test_siren(zha_gateway: Gateway) -> None: assert len(cluster.request.mock_calls) == 1 assert cluster.request.call_args[0][0] is False assert cluster.request.call_args[0][1] == 0 - assert cluster.request.call_args[0][3] == 2 # bitmask for default args - assert cluster.request.call_args[0][4] == 5 # duration in seconds - assert cluster.request.call_args[0][5] == 0 - assert cluster.request.call_args[0][6] == 2 + kw = cluster.request.call_args.kwargs + assert kw["warning"] == 2 # bitmask for default args + assert kw["warning_duration"] == 5 # duration in seconds + assert kw["strobe_duty_cycle"] == 0 + assert kw["stobe_level"] == 2 cluster.request.reset_mock() # test that the state has changed to off @@ -114,10 +116,11 @@ async def test_siren(zha_gateway: Gateway) -> None: assert len(cluster.request.mock_calls) == 1 assert cluster.request.call_args[0][0] is False assert cluster.request.call_args[0][1] == 0 - assert cluster.request.call_args[0][3] == 51 # bitmask for specified args - assert cluster.request.call_args[0][4] == 100 # duration in seconds - assert cluster.request.call_args[0][5] == 0 - assert cluster.request.call_args[0][6] == 2 + kw = cluster.request.call_args.kwargs + assert kw["warning"] == 51 # bitmask for specified args + assert kw["warning_duration"] == 100 # duration in seconds + assert kw["strobe_duty_cycle"] == 0 + assert kw["stobe_level"] == 2 cluster.request.reset_mock() # test that the state has changed to on @@ -149,10 +152,11 @@ async def test_basic_siren(zha_gateway: Gateway) -> None: assert len(cluster.request.mock_calls) == 1 assert cluster.request.call_args[0][0] is False assert cluster.request.call_args[0][1] == 0 - assert cluster.request.call_args[0][3] == 18 # bitmask for default args - assert cluster.request.call_args[0][4] == 5 # duration in seconds - assert cluster.request.call_args[0][5] == 0 - assert cluster.request.call_args[0][6] == 2 + kw = cluster.request.call_args.kwargs + assert kw["warning"] == 18 # bitmask for default args + assert kw["warning_duration"] == 5 # duration in seconds + assert kw["strobe_duty_cycle"] == 0 + assert kw["stobe_level"] == 2 cluster.request.reset_mock() # test that the state has changed to on @@ -168,10 +172,11 @@ async def test_basic_siren(zha_gateway: Gateway) -> None: assert len(cluster.request.mock_calls) == 1 assert cluster.request.call_args[0][0] is False assert cluster.request.call_args[0][1] == 0 - assert cluster.request.call_args[0][3] == 2 # bitmask for default args - assert cluster.request.call_args[0][4] == 5 # duration in seconds - assert cluster.request.call_args[0][5] == 0 - assert cluster.request.call_args[0][6] == 2 + kw = cluster.request.call_args.kwargs + assert kw["warning"] == 2 # bitmask for default args + assert kw["warning_duration"] == 5 # duration in seconds + assert kw["strobe_duty_cycle"] == 0 + assert kw["stobe_level"] == 2 cluster.request.reset_mock() # test that the state has changed to off @@ -187,10 +192,11 @@ async def test_basic_siren(zha_gateway: Gateway) -> None: assert len(cluster.request.mock_calls) == 1 assert cluster.request.call_args[0][0] is False assert cluster.request.call_args[0][1] == 0 - assert cluster.request.call_args[0][3] == 18 # bitmask for specified args - assert cluster.request.call_args[0][4] == 100 # duration in seconds - assert cluster.request.call_args[0][5] == 0 - assert cluster.request.call_args[0][6] == 2 + kw = cluster.request.call_args.kwargs + assert kw["warning"] == 18 # bitmask for specified args + assert kw["warning_duration"] == 100 # duration in seconds + assert kw["strobe_duty_cycle"] == 0 + assert kw["stobe_level"] == 2 cluster.request.reset_mock() # test that the state has changed to on @@ -216,10 +222,11 @@ async def test_siren_timed_off(zha_gateway: Gateway) -> None: assert len(cluster.request.mock_calls) == 1 assert cluster.request.call_args[0][0] is False assert cluster.request.call_args[0][1] == 0 - assert cluster.request.call_args[0][3] == 50 # bitmask for default args - assert cluster.request.call_args[0][4] == 5 # duration in seconds - assert cluster.request.call_args[0][5] == 0 - assert cluster.request.call_args[0][6] == 2 + kw = cluster.request.call_args.kwargs + assert kw["warning"] == 50 # bitmask for default args + assert kw["warning_duration"] == 5 # duration in seconds + assert kw["strobe_duty_cycle"] == 0 + assert kw["stobe_level"] == 2 cluster.request.reset_mock() # test that the state has changed to on diff --git a/tests/test_switch.py b/tests/test_switch.py index 22134db09..bf37af7cb 100644 --- a/tests/test_switch.py +++ b/tests/test_switch.py @@ -450,14 +450,12 @@ async def test_switch_configurable( cluster.write_attributes.reset_mock() cluster.write_attributes.side_effect = ZigbeeException - with pytest.raises(ZHAException): + with pytest.raises(ZigbeeException): await entity.async_turn_off() await zha_gateway.async_block_till_done() assert cluster.write_attributes.mock_calls == [ call({"window_detection_function": False}, manufacturer=UNDEFINED), - call({"window_detection_function": False}, manufacturer=UNDEFINED), - call({"window_detection_function": False}, manufacturer=UNDEFINED), ] cluster.write_attributes.side_effect = None @@ -744,12 +742,9 @@ async def test_cover_inversion_switch(zha_gateway: Gateway) -> None: } update_attribute_cache(cluster) zha_device = await join_zigpy_device(zha_gateway, zigpy_cover_device) - assert ( - not zha_device.endpoints[1] - .all_cluster_handlers[f"1:0x{cluster.cluster_id:04x}"] - .inverted - ) - assert cluster.read_attributes.call_count == 3 + entity = get_entity(zha_device, platform=Platform.SWITCH) + assert not entity.is_on + assert cluster.read_attributes.call_count == 2 assert ( WCAttrs.current_position_lift_percentage.name in cluster.read_attributes.call_args[0][0] @@ -759,8 +754,6 @@ async def test_cover_inversion_switch(zha_gateway: Gateway) -> None: in cluster.read_attributes.call_args[0][0] ) - entity = get_entity(zha_device, platform=Platform.SWITCH) - # test update prev_call_count = cluster.read_attributes.call_count await entity.async_update() @@ -835,7 +828,7 @@ async def test_cover_inversion_switch_not_created(zha_gateway: Gateway) -> None: update_attribute_cache(cluster) zha_device = await join_zigpy_device(zha_gateway, zigpy_cover_device) - assert cluster.read_attributes.call_count == 3 + assert cluster.read_attributes.call_count == 2 assert ( WCAttrs.current_position_lift_percentage.name in cluster.read_attributes.call_args[0][0] diff --git a/tools/regenerate_diagnostics.py b/tools/regenerate_diagnostics.py index cc49816ea..6aa07b7ce 100644 --- a/tools/regenerate_diagnostics.py +++ b/tools/regenerate_diagnostics.py @@ -11,7 +11,11 @@ import pathlib from unittest.mock import patch -from tests.common import ZhaJsonEncoder, join_zigpy_device, zigpy_device_from_json +from tests.common import ( + ZhaJsonEncoder, + join_zigpy_device, + zigpy_device_from_device_data, +) from tests.conftest import TestGateway, make_zha_data, make_zigpy_app_controller REPO_ROOT = pathlib.Path(__file__).parent.parent @@ -40,9 +44,12 @@ async def main(files: list[str] | None = None) -> None: async with create_zha_gateway() as zha_gateway: for device_json in paths: _LOGGER.info("Migrating %s", device_json) - zigpy_device = await zigpy_device_from_json( + device_data_text = device_json.read_text() + device_data = json.loads(device_data_text) + + zigpy_device = zigpy_device_from_device_data( zha_gateway.application_controller, - device_json, + device_data, ) with patch("zigpy.zcl.Cluster._update_attribute"): @@ -51,7 +58,9 @@ async def main(files: list[str] | None = None) -> None: new_json = json.dumps( zha_device.get_diagnostics_json(), indent=2, cls=ZhaJsonEncoder ) - device_json.write_text(new_json) + + if new_json != device_data_text: + device_json.write_text(new_json) await zha_device.on_remove() diff --git a/zha/application/__init__.py b/zha/application/__init__.py index 385cc9697..c3d9c5c23 100644 --- a/zha/application/__init__.py +++ b/zha/application/__init__.py @@ -22,5 +22,5 @@ class Platform(StrEnum): SIREN = "siren" SWITCH = "switch" VALVE = "valve" - UNKNOWN = "unknown" + VIRTUAL = "virtual" UPDATE = "update" diff --git a/zha/application/const.py b/zha/application/const.py index 8ac116fc2..302c8dd37 100644 --- a/zha/application/const.py +++ b/zha/application/const.py @@ -7,7 +7,6 @@ import bellows.zigbee.application import zigpy.application -import zigpy.types as t import zigpy_deconz.zigbee.application import zigpy_xbee.zigbee.application import zigpy_zigate.zigbee.application @@ -93,9 +92,6 @@ ENTITY_METADATA = "entity_metadata" -ZCL_INIT_ATTRS = "ZCL_INIT_ATTRS" -REPORT_CONFIG = "REPORT_CONFIG" - _ControllerClsType = type[zigpy.application.ControllerApplication] @@ -161,36 +157,9 @@ def pretty_name(self) -> str: UNKNOWN_MANUFACTURER = "unk_manufacturer" UNKNOWN_MODEL = "unk_model" -WARNING_DEVICE_MODE_STOP = 0 -WARNING_DEVICE_MODE_BURGLAR = 1 -WARNING_DEVICE_MODE_FIRE = 2 -WARNING_DEVICE_MODE_EMERGENCY = 3 -WARNING_DEVICE_MODE_POLICE_PANIC = 4 -WARNING_DEVICE_MODE_FIRE_PANIC = 5 -WARNING_DEVICE_MODE_EMERGENCY_PANIC = 6 - -WARNING_DEVICE_STROBE_NO = 0 -WARNING_DEVICE_STROBE_YES = 1 - -WARNING_DEVICE_SOUND_LOW = 0 -WARNING_DEVICE_SOUND_MEDIUM = 1 -WARNING_DEVICE_SOUND_HIGH = 2 -WARNING_DEVICE_SOUND_VERY_HIGH = 3 - -WARNING_DEVICE_STROBE_LOW = 0x00 -WARNING_DEVICE_STROBE_MEDIUM = 0x01 -WARNING_DEVICE_STROBE_HIGH = 0x02 -WARNING_DEVICE_STROBE_VERY_HIGH = 0x03 - -WARNING_DEVICE_SQUAWK_MODE_ARMED = 0 -WARNING_DEVICE_SQUAWK_MODE_DISARMED = 1 - -ZHA_CLUSTER_HANDLER_MSG = "zha_channel_message" -ZHA_CLUSTER_HANDLER_MSG_BIND = "zha_channel_bind" -ZHA_CLUSTER_HANDLER_MSG_CFG_RPT = "zha_channel_configure_reporting" -ZHA_CLUSTER_HANDLER_MSG_DATA = "zha_channel_msg_data" -ZHA_CLUSTER_HANDLER_CFG_DONE = "zha_channel_cfg_done" -ZHA_CLUSTER_HANDLER_READS_PER_REQ = 5 +ZHA_CLUSTER_BIND_EVENT = "zha_cluster_bind" +ZHA_CLUSTER_CONFIGURE_REPORTING_EVENT = "zha_cluster_configure_reporting" +ZHA_DEVICE_CONFIGURED_EVENT = "zha_device_configured" ZHA_EVENT = "zha_event" ZHA_DEVICE_UPDATED_EVENT = "zha_device_updated_event" ZHA_DEVICE_ENTITY_ADDED_EVENT = "zha_device_entity_added_event" @@ -212,13 +181,6 @@ def pretty_name(self) -> str: ZHA_GW_MSG_CONNECTION_LOST = "connection_lost" -class Strobe(t.enum8): - """Strobe enum.""" - - No_Strobe = 0x00 - Strobe = 0x01 - - class UniqueIdMigration(enum.Enum): """Migrateion root for unique ID.""" diff --git a/zha/application/discovery.py b/zha/application/discovery.py index aec9a259c..c7f74dfe3 100644 --- a/zha/application/discovery.py +++ b/zha/application/discovery.py @@ -4,11 +4,10 @@ from collections import Counter, defaultdict from collections.abc import Callable, Iterator -from dataclasses import astuple import functools import itertools import logging -from typing import TYPE_CHECKING +from typing import TYPE_CHECKING, Any from zigpy.quirks.v2 import ( BinarySensorMetadata, @@ -21,14 +20,16 @@ ZCLSensorMetadata, ) from zigpy.state import State -from zigpy.zcl import ClusterType +from zigpy.zcl import Cluster, ClusterType, ReportingConfig from zha.application import Platform, const as zha_const from zha.application.platforms import ( # noqa: F401 pylint: disable=unused-import ENTITY_REGISTRY, GROUP_ENTITY_REGISTRY, + AttrConfig, BaseEntity, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, PlatformEntity, PlatformFeatureGroup, alarm_control_panel, @@ -46,26 +47,8 @@ siren, switch, update, + virtual, ) - -# importing cluster handlers updates registries -from zha.zigbee.cluster_handlers import ( # noqa: F401 pylint: disable=unused-import - AttrReportConfig, - ClientClusterHandler, - ClusterHandler, - closures, - general, - homeautomation, - hvac, - lighting, - lightlink, - manufacturerspecific, - measurement, - protocol, - security, - smartenergy, -) -from zha.zigbee.cluster_handlers.registries import CLUSTER_HANDLER_ONLY_CLUSTERS from zha.zigbee.group import Group if TYPE_CHECKING: @@ -99,6 +82,24 @@ Platform.SWITCH, ) + +def _pick_primary_cluster(endpoint: Endpoint, match: ClusterMatch) -> Cluster | None: + """Pick the primary cluster for an entity from a ClusterMatch.""" + if match.server_clusters: + cluster_id = min(match.server_clusters) + return endpoint.zigpy_endpoint.in_clusters.get(cluster_id) + if match.client_clusters: + cluster_id = min(match.client_clusters) + return endpoint.zigpy_endpoint.out_clusters.get(cluster_id) + for cluster_id in sorted(match.optional_server_clusters): + if cluster_id in endpoint.zigpy_endpoint.in_clusters: + return endpoint.zigpy_endpoint.in_clusters[cluster_id] + for cluster_id in sorted(match.optional_client_clusters): + if cluster_id in endpoint.zigpy_endpoint.out_clusters: + return endpoint.zigpy_endpoint.out_clusters[cluster_id] + return None + + QUIRKS_ENTITY_META_TO_ENTITY_CLASS = { (Platform.BUTTON, WriteAttributeButtonMetadata): button.WriteAttributeButton, (Platform.BUTTON, ZCLCommandButtonMetadata): button.Button, @@ -291,21 +292,6 @@ def discover_quirks_v2_entities(device: Device) -> Iterator[PlatformEntity]: ) continue - if cluster_type is ClusterType.Server: - cluster_handler = endpoint.all_cluster_handlers.get( - f"{endpoint.id}:0x{cluster.cluster_id:04x}" - ) - else: - cluster_handler = endpoint.client_cluster_handlers.get( - f"{endpoint.id}:0x{cluster.cluster_id:04x}_client" - ) - - assert cluster_handler - - # flags to determine if we need to claim/bind the cluster handler - attribute_initialization_found: bool = False - reporting_found: bool = False - for entity_metadata in entity_metadata_list: platform = Platform(entity_metadata.entity_platform.value) metadata_type = type(entity_metadata) @@ -326,68 +312,72 @@ def discover_quirks_v2_entities(device: Device) -> Iterator[PlatformEntity]: ) continue - # process the entity metadata for ZCL_INIT_ATTRS and REPORT_CONFIG - if attr_name := getattr(entity_metadata, "attribute_name", None): - # TODO: ignore "attribute write buttons"? currently, we claim ch - # if the entity has a reporting config, add it to the cluster handler - if rep_conf := getattr(entity_metadata, "reporting_config", None): - # if attr is already in REPORT_CONFIG, remove it first - cluster_handler.REPORT_CONFIG = tuple( - filter( - lambda cfg: cfg["attr"] != attr_name, - cluster_handler.REPORT_CONFIG, - ) - ) - # tuples are immutable and we re-set the REPORT_CONFIG here, - # so no need to check for an instance variable - cluster_handler.REPORT_CONFIG += ( - AttrReportConfig(attr=attr_name, config=astuple(rep_conf)), - ) - # mark cluster handler for claiming and binding later - reporting_found = True - - # not in REPORT_CONFIG, add to ZCL_INIT_ATTRS if it not already in - elif attr_name not in cluster_handler.ZCL_INIT_ATTRS: - # copy existing ZCL_INIT_ATTRS into instance variable once, - # so we don't modify other instances of the same cluster handler - if zha_const.ZCL_INIT_ATTRS not in cluster_handler.__dict__: - cluster_handler.ZCL_INIT_ATTRS = ( - cluster_handler.ZCL_INIT_ATTRS.copy() - ) - # add the attribute to the guaranteed instance variable - cluster_handler.ZCL_INIT_ATTRS[attr_name] = ( - entity_metadata.attribute_initialized_from_cache - ) - # mark cluster handler for claiming later, but not binding - attribute_initialization_found = True - - yield entity_class( - cluster_handlers=[cluster_handler], + entity = entity_class( endpoint=endpoint, device=device, + cluster=cluster, entity_metadata=entity_metadata, - legacy_discovery_unique_id=f"{device.ieee}-{endpoint.id}", ) + # Translate quirks v2 reporting/attribute-init metadata into a + # per-instance cluster config that the cluster_config aggregator + # picks up alongside the entity's normal (class-level) declarations. + if attr_name := getattr(entity_metadata, "attribute_name", None): + rep_conf = getattr(entity_metadata, "reporting_config", None) + if rep_conf is not None: + attr_config = AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=rep_conf.min_interval, + max_interval=rep_conf.max_interval, + reportable_change=rep_conf.reportable_change, + ), + ) + bind = True + else: + attr_config = AttrConfig( + read_on_startup=( + not entity_metadata.attribute_initialized_from_cache + ), + ) + bind = False + + # Keep attr_name as a string here - quirks v2 entities can reference + # attribute names that aren't part of the cluster's attribute schema + # (e.g. manufacturer-specific extensions); aggregation/configure handle + # both name and ZCLAttributeDef. + config = { + cluster.cluster_id: ClusterConfig( + bind=bind, + attributes={attr_name: attr_config}, + ), + } + + if cluster_type is ClusterType.Server: + entity._server_cluster_config = config + else: + entity._client_cluster_config = config + + yield entity + _LOGGER.debug( - "'%s' platform -> '%s' using %s", + "'%s' platform -> '%s' using cluster 0x%04x", platform, entity_class.__name__, - [cluster_handler.name], + cluster.cluster_id, ) - # if the cluster handler is unclaimed, claim it and set BIND accordingly, - # so ZHA configures the cluster handler: reporting + reads attributes - if (attribute_initialization_found or reporting_found) and ( - cluster_handler not in endpoint.claimed_cluster_handlers.values() - ): - endpoint.claim_cluster_handlers([cluster_handler]) - # BIND is True by default, so only set to False if no reporting found. - # We can safely do this, since quirks v2 entities are initialized last, - # so if the cluster handler wasn't claimed by endpoint probing so far, - # only v2 entities need it. - if not reporting_found: - cluster_handler.BIND = False + +def _is_renamed_cluster(cluster: Cluster) -> bool: + """Return True if a quirk has renamed the cluster's ep_attribute.""" + standard = Cluster._registry.get(cluster.cluster_id) + if standard is None: + return False + + # Used to skip ClusterMatch entities for renamed clusters so the new cluster id + # based matching behaves the same as the legacy handler-name matching (which never + # found a handler under the standard name). + return cluster.ep_attribute != standard.ep_attribute def discover_entities_for_endpoint(endpoint: Endpoint) -> Iterator[PlatformEntity]: # noqa: C901 @@ -409,10 +399,26 @@ def discover_entities_for_endpoint(endpoint: Endpoint) -> Iterator[PlatformEntit PlatformFeatureGroup | None, defaultdict[ int, # Weight - list[tuple[ClusterHandlerMatch, type[PlatformEntity]]], + list[tuple[ClusterMatch, type[PlatformEntity]]], ], ] = defaultdict(lambda: defaultdict(list)) + # Cluster IDs available to ClusterMatch (renamed quirked clusters excluded to + # mirror the legacy handler-name based matching). Entities that opt into + # `match_renamed_clusters=True` get the inclusive sets instead. + in_cluster_ids = { + cid + for cid, cluster in endpoint.zigpy_endpoint.in_clusters.items() + if not _is_renamed_cluster(cluster) + } + out_cluster_ids = { + cid + for cid, cluster in endpoint.zigpy_endpoint.out_clusters.items() + if not _is_renamed_cluster(cluster) + } + in_cluster_ids_with_renamed = set(endpoint.zigpy_endpoint.in_clusters) + out_cluster_ids_with_renamed = set(endpoint.zigpy_endpoint.out_clusters) + for cluster in itertools.chain( endpoint.zigpy_endpoint.in_clusters.values(), endpoint.zigpy_endpoint.out_clusters.values(), @@ -420,17 +426,26 @@ def discover_entities_for_endpoint(endpoint: Endpoint) -> Iterator[PlatformEntit # To speed up lookups, we key ENTITY_REGISTRY by cluster ID. First, we find all # compatible entities and their matching criteria. for entity_class in ENTITY_REGISTRY.get(cluster.cluster_id, []): - match = entity_class._cluster_handler_match - if match is None: + if entity_class._cluster_match is None: continue + match = entity_class._cluster_match - if not match.cluster_handlers.issubset( - endpoint.cluster_handlers_by_name.keys() - ): + if match.match_renamed_clusters: + available_in = in_cluster_ids_with_renamed + available_out = out_cluster_ids_with_renamed + else: + available_in = in_cluster_ids + available_out = out_cluster_ids + + if not match.server_clusters.issubset(available_in): continue - if not match.client_cluster_handlers.issubset( - endpoint.client_cluster_handlers_by_name.keys() + if not match.client_clusters.issubset(available_out): + continue + + if ( + match.profile_ids is not None + and endpoint.zigpy_endpoint.profile_id not in match.profile_ids ): continue @@ -459,23 +474,22 @@ def discover_entities_for_endpoint(endpoint: Endpoint) -> Iterator[PlatformEntit endpoint.zigpy_endpoint.profile_id, endpoint.zigpy_endpoint.device_type, ) + override_bypass = ( + platform_override is not None + and platform_override == entity_class.PLATFORM + ) + if ( match.profile_device_types is not None and profile_device_type not in match.profile_device_types - and not ( - platform_override is not None - and platform_override == entity_class.PLATFORM - ) + and not override_bypass ): continue if ( match.not_profile_device_types is not None and profile_device_type in match.not_profile_device_types - and not ( - platform_override is not None - and platform_override == entity_class.PLATFORM - ) + and not override_bypass ): continue @@ -496,7 +510,8 @@ def discover_entities_for_endpoint(endpoint: Endpoint) -> Iterator[PlatformEntit # system when competing entities are part of the same feature group if platform_override is not None and feature is not None: override_by_priority: defaultdict[ - int, list[tuple[ClusterHandlerMatch, type[PlatformEntity]]] + int, + list[tuple[ClusterMatch, type[PlatformEntity]]], ] = defaultdict(list) for priority, priority_matches in matches_by_priority.items(): @@ -528,54 +543,39 @@ def discover_entities_for_endpoint(endpoint: Endpoint) -> Iterator[PlatformEntit ignored_matches, ) - matches = matches_by_priority[highest_priority] - - for match, entity_class in matches: - server_handlers = set(match.cluster_handlers) - - for optional in match.optional_cluster_handlers: - if optional in endpoint.cluster_handlers_by_name: - server_handlers.add(optional) + selected_matches = matches_by_priority[highest_priority] - client_handlers = set(match.client_cluster_handlers) - - server_cluster_handlers = [ - endpoint.cluster_handlers_by_name[name] for name in server_handlers - ] - client_cluster_handlers = [ - endpoint.client_cluster_handlers_by_name[name] - for name in client_handlers + # Use platform overrides to replace the results of the normal priority scoring + # system when competing entities are part of the same feature group + if platform_override is not None and feature is not None: + override_matches = [ + (match, entity) + for priority_matches in matches_by_priority.values() + for match, entity in priority_matches + if platform_override == entity.PLATFORM ] + if override_matches: + selected_matches = override_matches - # Claim on endpoint - endpoint.claim_cluster_handlers(server_cluster_handlers) - endpoint.claim_cluster_handlers(client_cluster_handlers) - + for match, entity_class in selected_matches: _LOGGER.debug( - "'%s' platform -> '%s' using %s + %s", + "'%s' platform -> '%s'", entity_class.PLATFORM, entity_class.__name__, - [ch.name for ch in server_cluster_handlers], - [ch.name for ch in client_cluster_handlers], ) - # XXX: Combining server and client cluster handlers should not be done - cluster_handlers: list[ClusterHandler | ClientClusterHandler] = ( - server_cluster_handlers + client_cluster_handlers # type: ignore[operator] - ) - - yield entity_class( - cluster_handlers=cluster_handlers, - endpoint=endpoint, - device=device, - ) + kwargs: dict[str, Any] = {} + cluster = _pick_primary_cluster(endpoint, match) + if cluster is not None: + kwargs["cluster"] = cluster - # Claim any remaining unclaimed cluster handlers that don't produce entities but - # still need to be configured for bare events (bound, reporting set up, etc.) - for cluster_handler in endpoint.all_cluster_handlers.values(): - if ( - cluster_handler.id not in endpoint.claimed_cluster_handlers - and cluster_handler.cluster.cluster_id in CLUSTER_HANDLER_ONLY_CLUSTERS - ): - _LOGGER.debug("Claiming entityless cluster handler %s", cluster_handler) - endpoint.claim_cluster_handlers([cluster_handler]) + try: + entity = entity_class( + endpoint=endpoint, + device=device, + **kwargs, + ) + except Exception: # pylint: disable=broad-except + _LOGGER.exception("Failed to create %s entity", entity_class.__name__) + continue + yield entity diff --git a/zha/application/helpers.py b/zha/application/helpers.py index a0e09b179..7a8a81911 100644 --- a/zha/application/helpers.py +++ b/zha/application/helpers.py @@ -23,6 +23,9 @@ import zigpy.util import zigpy.zcl from zigpy.zcl import foundation +from zigpy.zcl.clusters.closures import WindowCovering +from zigpy.zcl.clusters.general import AnalogOutput, LevelControl, OnOff +from zigpy.zcl.clusters.lighting import Color from zigpy.zcl.foundation import CommandSchema import zigpy.zdo.types as zdo_types @@ -35,18 +38,30 @@ ) from zha.async_ import gather_with_limited_concurrency from zha.decorators import periodic +from zha.exceptions import ZHAException if TYPE_CHECKING: from zha.application.gateway import Gateway - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device -_ClusterHandlerT = TypeVar("_ClusterHandlerT", bound="ClusterHandler") _T = TypeVar("_T") _R = TypeVar("_R") _P = ParamSpec("_P") _LOGGER = logging.getLogger(__name__) +# Clusters that make sense as direct device-to-device binding pairs (e.g. a +# remote's out_cluster bound to a light's in_cluster). Consulted by HA's "bind +# device" UI via `async_is_bindable_target`. +BINDABLE_CLUSTERS: frozenset[int] = frozenset( + { + AnalogOutput.cluster_id, + OnOff.cluster_id, + LevelControl.cluster_id, + WindowCovering.cluster_id, + Color.cluster_id, + } +) + @dataclass class BindingPair: @@ -89,14 +104,30 @@ async def safe_read( return {} +async def write_attributes_safe( + cluster: zigpy.zcl.Cluster, + attributes: dict[str, Any], + manufacturer: int | UndefinedType | None = UNDEFINED, +) -> None: + """Write attributes and raise on any per-attribute failure.""" + res = await cluster.write_attributes(attributes, manufacturer=manufacturer) + for record in res[0]: + if record.status != foundation.Status.SUCCESS: + try: + name = cluster.attributes[record.attrid].name + value = attributes.get(name, "unknown") + except KeyError: + name = f"0x{record.attrid:04x}" + value = "unknown" + raise ZHAException( + f"Failed to write attribute {name}={value}: {record.status}", + ) + + async def get_matched_clusters( source_zha_device: Device, target_zha_device: Device ) -> list[BindingPair]: """Get matched input/output cluster pairs for 2 devices.""" - from zha.zigbee.cluster_handlers.registries import ( # pylint: disable=import-outside-toplevel # noqa: PLC0415 - BINDABLE_CLUSTERS, - ) - source_clusters = source_zha_device.async_get_std_clusters() target_clusters = target_zha_device.async_get_std_clusters() clusters_to_bind = [] @@ -201,10 +232,6 @@ def convert_to_zcl_values( def async_is_bindable_target(source_zha_device: Device, target_zha_device: Device): """Determine if target is bindable to source.""" - from zha.zigbee.cluster_handlers.registries import ( # pylint: disable=import-outside-toplevel # noqa: PLC0415 - BINDABLE_CLUSTERS, - ) - if target_zha_device.nwk == 0x0000: return True diff --git a/zha/application/platforms/__init__.py b/zha/application/platforms/__init__.py index 9da3fc16c..46abf7454 100644 --- a/zha/application/platforms/__init__.py +++ b/zha/application/platforms/__init__.py @@ -5,18 +5,24 @@ from abc import abstractmethod import asyncio from collections import defaultdict -from collections.abc import Callable +from collections.abc import Callable, Mapping from contextlib import suppress import dataclasses +from dataclasses import dataclass, field from enum import StrEnum from functools import cached_property import logging -from typing import TYPE_CHECKING, Any, Final, Literal, final +from types import MappingProxyType +from typing import TYPE_CHECKING, Any, Final, final -from zigpy.profiles import zha, zll +from zigpy.profiles.zha import PROFILE_ID as ZHA_PROFILE_ID +from zigpy.profiles.zll import PROFILE_ID as ZLL_PROFILE_ID from zigpy.quirks.v2 import EntityMetadata, EntityType from zigpy.types import ClusterId from zigpy.types.named import EUI64 +import zigpy.zcl +from zigpy.zcl import ReportingConfig +from zigpy.zcl.foundation import ZCLAttributeDef from zha.application import Platform from zha.application.const import UniqueIdMigration @@ -24,10 +30,8 @@ from zha.debounce import Debouncer from zha.event import EventBase from zha.mixins import LogMixin -from zha.zigbee.cluster_handlers import ClusterHandlerInfo if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint from zha.zigbee.group import Group @@ -63,11 +67,8 @@ class PlatformFeatureGroup(StrEnum): # Manufacturer-specific overrides for EM active power polling EM_ACTIVE_POWER = "em_active_power" - # Model-specific overrides for Smart Energy Summation - SMART_ENERGY_SUMMATION = "smart_energy_summation" - - # Overrides for Smart Energy Summation Received - SMART_ENERGY_SUMMATION_RECEIVED = "smart_energy_summation_received" + # Suppress EM cluster polling for devices known to report reliably + EM_POLLING = "em_polling" # Model-specific overrides for local temperature calibration LOCAL_TEMPERATURE_CALIBRATION = "local_temperature_calibration" @@ -79,13 +80,33 @@ class PlatformFeatureGroup(StrEnum): SIREN = "siren" -@dataclasses.dataclass(frozen=True) -class ClusterHandlerMatch: - """Declares cluster handler requirements for an entity class.""" +@dataclass(frozen=True) +class AttrConfig: + """Per-attribute configuration for cluster setup.""" + + read_on_startup: bool + reporting: ReportingConfig | None = None + + +@dataclass(frozen=True) +class ClusterConfig: + """Per-cluster configuration.""" + + # Whether to bind this cluster to the coordinator. + bind: bool = False + + # Per-attribute configuration keyed by ZCL attribute definition or name. + attributes: dict[ZCLAttributeDef | str, AttrConfig] = field(default_factory=dict) - cluster_handlers: frozenset[str] = frozenset() - client_cluster_handlers: frozenset[str] = frozenset() - optional_cluster_handlers: frozenset[str] = frozenset() + +@dataclass(frozen=True) +class ClusterMatch: + """Declares which clusters an entity requires for discovery.""" + + server_clusters: frozenset[int] = frozenset() + client_clusters: frozenset[int] = frozenset() + optional_server_clusters: frozenset[int] = frozenset() + optional_client_clusters: frozenset[int] = frozenset() # Strict filters: if present, device info must match manufacturers: frozenset[str] | None = None @@ -93,28 +114,34 @@ class ClusterHandlerMatch: exposed_features: frozenset[str] | None = None not_exposed_features: frozenset[str] | None = None - # If present, device must match one of the given profile and device type combinations. - # This will be ignored if `platform_override` is used. - profile_device_types: ( # type:ignore[valid-type] - frozenset[ - tuple[Literal[zha.PROFILE_ID], zha.DeviceType] - | tuple[Literal[zll.PROFILE_ID], zll.DeviceType] - | tuple[int, int] - ] - | None - ) = None - not_profile_device_types: ( # type:ignore[valid-type] - frozenset[ - tuple[Literal[zha.PROFILE_ID], zha.DeviceType] - | tuple[Literal[zll.PROFILE_ID], zll.DeviceType] - | tuple[int, int] - ] - | None - ) = None + # `None` matches any profile. + profile_ids: frozenset[int] | None = frozenset({ZHA_PROFILE_ID, ZLL_PROFILE_ID}) + + # Profile and device type filters + profile_device_types: frozenset[tuple[int, int]] | None = None + not_profile_device_types: frozenset[tuple[int, int]] | None = None # For a given feature, only entities with the highest priority will be considered feature_priority: tuple[PlatformFeatureGroup, int] | None = None + # By default ClusterMatch skips clusters whose ep_attribute was renamed by + # a quirk (so a Switch entity doesn't auto-attach to a Tuya-renamed OnOff + # cluster). Bind-only virtual entities can opt back in via this flag, since + # they don't care about cluster semantics — only that the cluster_id is + # what they target. + match_renamed_clusters: bool = False + + def __post_init__(self) -> None: + """Validate the ClusterMatch.""" + if self.profile_device_types is not None and self.profile_ids is not None: + profile_device_type_profiles = {p for p, _ in self.profile_device_types} + + if not profile_device_type_profiles <= self.profile_ids: + raise ValueError( + "profile_device_types contain profiles not in profile_ids: " + f"{profile_device_type_profiles - self.profile_ids}" + ) + def register_entity[T: type[PlatformEntity]](cluster_id: ClusterId) -> Callable[[T], T]: """Register an entity class for discovery.""" @@ -162,7 +189,6 @@ class BaseEntityInfo: primary: bool # For platform entities - cluster_handlers: list[ClusterHandlerInfo] device_ieee: EUI64 | None endpoint_id: int | None available: bool | None @@ -210,7 +236,13 @@ class EntityStateChangedEvent: class BaseEntity(LogMixin, EventBase): """Base class for entities.""" - PLATFORM: Platform = Platform.UNKNOWN + PLATFORM: Platform + + async def async_configure_cluster(self, cluster: Any) -> None: + """Run post-bind cluster-level setup (override in subclasses).""" + + async def async_initialize_cluster(self, cluster: Any) -> None: + """Run post-initialize cluster-level work (override in subclasses).""" _attr_fallback_name: str | None = None _attr_icon: str | None = None @@ -370,7 +402,6 @@ def info_object(self) -> BaseEntityInfo: enabled=self.enabled, primary=self.primary, # Set by platform entities - cluster_handlers=[], device_ieee=None, endpoint_id=None, available=None, @@ -451,15 +482,19 @@ class PlatformEntity(BaseEntity): _migrate_platform_unique_ids: tuple[tuple[UniqueIdMigration, str]] | None = None - # Auto-discovery for the entity - _cluster_handler_match: ClusterHandlerMatch | None + # Direct cluster matching for discovery + _cluster_match: ClusterMatch | None = None + + # Per-cluster configuration (keyed by cluster ID) + _server_cluster_config: Mapping[int, ClusterConfig] = MappingProxyType({}) + _client_cluster_config: Mapping[int, ClusterConfig] = MappingProxyType({}) def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, *, + cluster: zigpy.zcl.Cluster, entity_metadata: EntityMetadata | None = None, legacy_discovery_unique_id: str | None = None, **kwargs: Any, @@ -469,9 +504,12 @@ def __init__( self._init_from_quirks_metadata(entity_metadata) if legacy_discovery_unique_id is None: - legacy_discovery_unique_id = ( - f"{device.ieee}-{endpoint.id}-{cluster_handlers[0].cluster.cluster_id}" - ) + if entity_metadata is not None: + legacy_discovery_unique_id = f"{device.ieee}-{endpoint.id}" + else: + legacy_discovery_unique_id = ( + f"{device.ieee}-{endpoint.id}-{cluster.cluster_id}" + ) if self._unique_id_suffix is not None: unique_id = f"{legacy_discovery_unique_id}-{self._unique_id_suffix}" @@ -480,14 +518,9 @@ def __init__( super().__init__(unique_id=unique_id, **kwargs) - self._cluster_handlers: list[ClusterHandler] = cluster_handlers - self.cluster_handlers: dict[str, ClusterHandler] = {} - - for cluster_handler in cluster_handlers: - self.cluster_handlers[cluster_handler.name] = cluster_handler - self._device: Device = device self._endpoint = endpoint + self._cluster: zigpy.zcl.Cluster = cluster def _init_from_quirks_metadata(self, entity_metadata: EntityMetadata) -> None: """Init this entity from the quirks metadata.""" @@ -544,7 +577,6 @@ def info_object(self) -> BaseEntityInfo: """Return a representation of the platform entity.""" return dataclasses.replace( super().info_object, - cluster_handlers=[ch.info_object for ch in self._cluster_handlers], device_ieee=self._device.ieee, endpoint_id=self._endpoint.id, available=self.available, @@ -560,6 +592,11 @@ def endpoint(self) -> Endpoint: """Return the endpoint.""" return self._endpoint + @property + def cluster(self) -> zigpy.zcl.Cluster: + """Return the ZCL cluster backing this entity.""" + return self._cluster + @property def should_poll(self) -> bool: """Return True if we need to poll for state changes.""" @@ -578,16 +615,11 @@ def state(self) -> dict[str, Any]: return state async def async_update(self) -> None: - """Retrieve latest state.""" - self.debug("polling current state") - tasks = [ - cluster_handler.async_update() - for cluster_handler in self.cluster_handlers.values() - if hasattr(cluster_handler, "async_update") - ] - if tasks: - await asyncio.gather(*tasks) - self.maybe_emit_state_changed_event() + """Retrieve latest state. + + Default no-op: subclasses that need polling override this to read their + own attributes directly from the relevant cluster(s). + """ class GroupEntity(BaseEntity): diff --git a/zha/application/platforms/alarm_control_panel/__init__.py b/zha/application/platforms/alarm_control_panel/__init__.py index 50ea4608b..1657125dd 100644 --- a/zha/application/platforms/alarm_control_panel/__init__.py +++ b/zha/application/platforms/alarm_control_panel/__init__.py @@ -3,18 +3,19 @@ from __future__ import annotations from abc import ABC, abstractmethod +from collections.abc import Callable from dataclasses import dataclass import functools import logging -from typing import TYPE_CHECKING, Any, cast +from typing import TYPE_CHECKING, Any -from zigpy.profiles import zha -from zigpy.zcl.clusters.security import IasAce +from zigpy.zcl.clusters.security import IasAce as AceCluster from zha.application import Platform from zha.application.platforms import ( BaseEntityInfo, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, PlatformEntity, register_entity, ) @@ -27,22 +28,17 @@ AlarmState, CodeFormat, ) -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_IAS_ACE, - CLUSTER_HANDLER_STATE_CHANGED, -) -from zha.zigbee.cluster_handlers.security import ( - ClusterHandlerStateChangedEvent, - IasAceClientClusterHandler, -) +from zha.zigbee.endpoint import cluster_event_unique_id if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint _LOGGER = logging.getLogger(__name__) +SIGNAL_ARMED_STATE_CHANGED = "zha_armed_state_changed" +SIGNAL_ALARM_TRIGGERED = "zha_armed_triggered" + @dataclass(frozen=True, kw_only=True) class AlarmControlPanelEntityInfo(BaseEntityInfo): @@ -120,7 +116,7 @@ async def async_alarm_trigger(self, code: str | None = None) -> None: """Send alarm trigger command.""" -@register_entity(IasAce.cluster_id) +@register_entity(AceCluster.cluster_id) class AlarmControlPanel(BaseAlarmControlPanel): """Entity for ZHA alarm control devices.""" @@ -133,93 +129,282 @@ class AlarmControlPanel(BaseAlarmControlPanel): | SUPPORT_ALARM_TRIGGER ) - _cluster_handler_match = ClusterHandlerMatch( - client_cluster_handlers=frozenset({CLUSTER_HANDLER_IAS_ACE}), + _cluster_match = ClusterMatch( + client_clusters=frozenset({AceCluster.cluster_id}), ) + _client_cluster_config = { + AceCluster.cluster_id: ClusterConfig( + bind=True, + ), + } + def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs, ) -> None: """Initialize the ZHA alarm control device.""" legacy_discovery_unique_id = ( - f"{endpoint.device.ieee}-{endpoint.id}-{int(IasAce.cluster_id)}" - if ( - endpoint.zigpy_endpoint.device_type - == zha.DeviceType.IAS_ANCILLARY_CONTROL - ) - else f"{endpoint.device.ieee}-{endpoint.id}-{int(IasAce.cluster_id)}" + f"{endpoint.device.ieee}-{endpoint.id}-{int(AceCluster.cluster_id)}" ) super().__init__( - cluster_handlers, - endpoint, - device, + endpoint=endpoint, + device=device, **kwargs, legacy_discovery_unique_id=legacy_discovery_unique_id, ) + self._cluster = endpoint.zigpy_endpoint.out_clusters[AceCluster.cluster_id] + self._cluster_event_unique_id = cluster_event_unique_id(endpoint, self._cluster) + alarm_options = device.gateway.config.config.alarm_control_panel_options - self._cluster_handler: IasAceClientClusterHandler = cast( - IasAceClientClusterHandler, cluster_handlers[0] - ) - self._cluster_handler.panel_code = alarm_options.master_code - self._cluster_handler.code_required_arm_actions = ( - alarm_options.arm_requires_code - ) - self._cluster_handler.max_invalid_tries = alarm_options.failed_tries + self.panel_code: str = alarm_options.master_code + self.code_required_arm_actions: bool = alarm_options.arm_requires_code + self.max_invalid_tries: int = alarm_options.failed_tries + + self.armed_state: AceCluster.PanelStatus = AceCluster.PanelStatus.Panel_Disarmed + self.alarm_status: AceCluster.AlarmStatus = AceCluster.AlarmStatus.No_Alarm + self.invalid_tries: int = 0 + + self._command_map: dict[int, Callable[..., Any]] = { + AceCluster.ServerCommandDefs.arm.id: self._cmd_arm, + AceCluster.ServerCommandDefs.bypass.id: self._bypass, + AceCluster.ServerCommandDefs.emergency.id: self._emergency, + AceCluster.ServerCommandDefs.fire.id: self._fire, + AceCluster.ServerCommandDefs.panic.id: self._panic_cmd, + AceCluster.ServerCommandDefs.get_zone_id_map.id: self._get_zone_id_map, + AceCluster.ServerCommandDefs.get_zone_info.id: self._get_zone_info, + AceCluster.ServerCommandDefs.get_panel_status.id: self._send_panel_status_response, + AceCluster.ServerCommandDefs.get_bypassed_zone_list.id: self._get_bypassed_zone_list, + AceCluster.ServerCommandDefs.get_zone_status.id: self._get_zone_status, + } + self._arm_map: dict[AceCluster.ArmMode, Callable[..., Any]] = { + AceCluster.ArmMode.Disarm: self._disarm, + AceCluster.ArmMode.Arm_All_Zones: self._arm_away, + AceCluster.ArmMode.Arm_Day_Home_Only: self._arm_day, + AceCluster.ArmMode.Arm_Night_Sleep_Only: self._arm_night, + } def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._cluster_handler.on_event( - CLUSTER_HANDLER_STATE_CHANGED, self._handle_event_protocol + self._cluster.add_listener(self) + self._on_remove_callbacks.append(lambda: self._cluster.remove_listener(self)) + + def cluster_command(self, tsn: int, command_id: int, args: list[Any]) -> None: + """Handle commands received on the IAS ACE cluster.""" + self.debug( + "received command %s", self._cluster.server_commands[command_id].name + ) + self._command_map[command_id](*args) + + def _emit_zha_event(self, command: str, args: list | dict) -> None: + """Relay a cluster-level zha_event via the endpoint.""" + self._endpoint.emit_zha_event( + { + "unique_id": self._cluster_event_unique_id, + "cluster_id": self._cluster.cluster_id, + "command": command, + "args": args if isinstance(args, list) else [], + "params": args if isinstance(args, dict) else {}, + } + ) + + def _cmd_arm(self, arm_mode: int, code: str | None, zone_id: int) -> None: + """Handle the IAS ACE arm command.""" + mode = AceCluster.ArmMode(arm_mode) + + self._emit_zha_event( + AceCluster.ServerCommandDefs.arm.name, + { + "arm_mode": mode.value, + "arm_mode_description": mode.name, + "code": code, + "zone_id": zone_id, + }, + ) + + zigbee_reply = self._arm_map[mode](code) + self._device.gateway.async_create_task(zigbee_reply) + + if self.invalid_tries >= self.max_invalid_tries: + self.alarm_status = AceCluster.AlarmStatus.Emergency + self.armed_state = AceCluster.PanelStatus.In_Alarm + self._emit_zha_event( + f"{self._cluster_event_unique_id}_{SIGNAL_ALARM_TRIGGERED}", [] + ) + else: + self._emit_zha_event( + f"{self._cluster_event_unique_id}_{SIGNAL_ARMED_STATE_CHANGED}", [] + ) + self._emit_panel_status_changed() + + def _disarm(self, code: str): + """Test the code and disarm the panel if the code is correct.""" + if ( + code != self.panel_code + and self.armed_state != AceCluster.PanelStatus.Panel_Disarmed + ): + self.debug("Invalid code supplied to IAS ACE") + self.invalid_tries += 1 + zigbee_reply = self._cluster.arm_response( + AceCluster.ArmNotification.Invalid_Arm_Disarm_Code + ) + else: + self.invalid_tries = 0 + if ( + self.armed_state == AceCluster.PanelStatus.Panel_Disarmed + and self.alarm_status == AceCluster.AlarmStatus.No_Alarm + ): + self.debug("IAS ACE already disarmed") + zigbee_reply = self._cluster.arm_response( + AceCluster.ArmNotification.Already_Disarmed + ) + else: + self.debug("Disarming all IAS ACE zones") + zigbee_reply = self._cluster.arm_response( + AceCluster.ArmNotification.All_Zones_Disarmed + ) + + self.armed_state = AceCluster.PanelStatus.Panel_Disarmed + self.alarm_status = AceCluster.AlarmStatus.No_Alarm + return zigbee_reply + + def _arm_day(self, code: str): + """Arm the panel for day / home zones.""" + return self._handle_arm( + code, + AceCluster.PanelStatus.Armed_Stay, + AceCluster.ArmNotification.Only_Day_Home_Zones_Armed, + ) + + def _arm_night(self, code: str): + """Arm the panel for night / sleep zones.""" + return self._handle_arm( + code, + AceCluster.PanelStatus.Armed_Night, + AceCluster.ArmNotification.Only_Night_Sleep_Zones_Armed, + ) + + def _arm_away(self, code: str): + """Arm the panel for away mode.""" + return self._handle_arm( + code, + AceCluster.PanelStatus.Armed_Away, + AceCluster.ArmNotification.All_Zones_Armed, + ) + + def _handle_arm( + self, + code: str, + panel_status: AceCluster.PanelStatus, + armed_type: AceCluster.ArmNotification, + ): + """Arm the panel with the specified statuses.""" + if self.code_required_arm_actions and code != self.panel_code: + self.debug("Invalid code supplied to IAS ACE") + zigbee_reply = self._cluster.arm_response( + AceCluster.ArmNotification.Invalid_Arm_Disarm_Code ) + else: + self.debug("Arming all IAS ACE zones") + self.armed_state = panel_status + zigbee_reply = self._cluster.arm_response(armed_type) + return zigbee_reply + + def _bypass(self, zone_list, code) -> None: + """Handle the IAS ACE bypass command.""" + self._emit_zha_event( + AceCluster.ServerCommandDefs.bypass.name, + {"zone_list": zone_list, "code": code}, ) + def _emergency(self) -> None: + """Handle the IAS ACE emergency command.""" + self._set_alarm(AceCluster.AlarmStatus.Emergency) + + def _fire(self) -> None: + """Handle the IAS ACE fire command.""" + self._set_alarm(AceCluster.AlarmStatus.Fire) + + def _panic_cmd(self) -> None: + """Handle the IAS ACE panic command (received from device).""" + self._set_alarm(AceCluster.AlarmStatus.Emergency_Panic) + + def _set_alarm(self, status: AceCluster.AlarmStatus) -> None: + """Set the specified alarm status.""" + self.alarm_status = status + self.armed_state = AceCluster.PanelStatus.In_Alarm + self._emit_panel_status_changed() + + def _get_zone_id_map(self): + """Handle the IAS ACE zone id map command.""" + + def _get_zone_info(self, zone_id): + """Handle the IAS ACE zone info command.""" + + def _send_panel_status_response(self) -> None: + """Handle the IAS ACE panel status response command.""" + response = self._cluster.panel_status_response( + self.armed_state, + 0x00, + AceCluster.AudibleNotification.Default_Sound, + self.alarm_status, + ) + self._device.gateway.async_create_task(response) + + def _emit_panel_status_changed(self) -> None: + """Handle the IAS ACE panel status changed command.""" + response = self._cluster.panel_status_changed( + self.armed_state, + 0x00, + AceCluster.AudibleNotification.Default_Sound, + self.alarm_status, + ) + self._device.gateway.async_create_task(response) + self.maybe_emit_state_changed_event() + + def _get_bypassed_zone_list(self): + """Handle the IAS ACE bypassed zone list command.""" + + def _get_zone_status( + self, starting_zone_id, max_zone_ids, zone_status_mask_flag, zone_status_mask + ): + """Handle the IAS ACE zone status command.""" + @property def alarm_state(self) -> AlarmState: """Return the current alarm state.""" - return IAS_ACE_STATE_MAP.get( - self._cluster_handler.armed_state, AlarmState.UNKNOWN - ) + return IAS_ACE_STATE_MAP.get(self.armed_state, AlarmState.UNKNOWN) @property def code_arm_required(self) -> bool: """Whether the code is required for arm actions.""" - return self._cluster_handler.code_required_arm_actions - - def handle_cluster_handler_state_changed( - self, - event: ClusterHandlerStateChangedEvent, # pylint: disable=unused-argument - ) -> None: - """Handle state changed on cluster.""" - self.maybe_emit_state_changed_event() + return self.code_required_arm_actions async def async_alarm_disarm(self, code: str | None = None) -> None: """Send disarm command.""" - self._cluster_handler.arm(IasAce.ArmMode.Disarm, code, 0) + self._cmd_arm(AceCluster.ArmMode.Disarm, code, 0) self.maybe_emit_state_changed_event() async def async_alarm_arm_home(self, code: str | None = None) -> None: """Send arm home command.""" - self._cluster_handler.arm(IasAce.ArmMode.Arm_Day_Home_Only, code, 0) + self._cmd_arm(AceCluster.ArmMode.Arm_Day_Home_Only, code, 0) self.maybe_emit_state_changed_event() async def async_alarm_arm_away(self, code: str | None = None) -> None: """Send arm away command.""" - self._cluster_handler.arm(IasAce.ArmMode.Arm_All_Zones, code, 0) + self._cmd_arm(AceCluster.ArmMode.Arm_All_Zones, code, 0) self.maybe_emit_state_changed_event() async def async_alarm_arm_night(self, code: str | None = None) -> None: """Send arm night command.""" - self._cluster_handler.arm(IasAce.ArmMode.Arm_Night_Sleep_Only, code, 0) + self._cmd_arm(AceCluster.ArmMode.Arm_Night_Sleep_Only, code, 0) self.maybe_emit_state_changed_event() async def async_alarm_trigger(self, code: str | None = None) -> None: # pylint: disable=unused-argument """Send alarm trigger command.""" - self._cluster_handler.panic() + self._panic_cmd() self.maybe_emit_state_changed_event() diff --git a/zha/application/platforms/binary_sensor/__init__.py b/zha/application/platforms/binary_sensor/__init__.py index 9e5f101ab..663c7daf5 100644 --- a/zha/application/platforms/binary_sensor/__init__.py +++ b/zha/application/platforms/binary_sensor/__init__.py @@ -12,15 +12,25 @@ from zhaquirks.quirk_ids import DANFOSS_ALLY_THERMOSTAT from zigpy.profiles import zha, zll from zigpy.quirks.v2 import BinarySensorMetadata +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, +) from zigpy.zcl.clusters.general import BinaryInput as BinaryInputCluster, OnOff from zigpy.zcl.clusters.hvac import Thermostat from zigpy.zcl.clusters.measurement import OccupancySensing from zigpy.zcl.clusters.security import IasZone from zha.application import Platform +from zha.application.helpers import safe_read from zha.application.platforms import ( + AttrConfig, BaseEntityInfo, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, EntityCategory, PlatformEntity, PlatformFeatureGroup, @@ -30,24 +40,15 @@ IAS_ZONE_CLASS_MAPPING, BinarySensorDeviceClass, ) -from zha.application.platforms.helpers import validate_device_class -from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent -from zha.zigbee.cluster_handlers.const import ( +from zha.application.platforms.const import ( AQARA_OPPLE_CLUSTER, - CLUSTER_HANDLER_ACCELEROMETER, - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_BINARY_INPUT, - CLUSTER_HANDLER_OCCUPANCY, - CLUSTER_HANDLER_ON_OFF, - CLUSTER_HANDLER_THERMOSTAT, - CLUSTER_HANDLER_ZONE, IKEA_AIR_PURIFIER_CLUSTER, SMARTTHINGS_ACCELERATION_CLUSTER, TUYA_MANUFACTURER_CLUSTER, ) +from zha.application.platforms.helpers import validate_device_class if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint @@ -89,26 +90,34 @@ class BinarySensor(BaseBinarySensor): def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs, ) -> None: """Initialize the ZHA binary sensor.""" - self._cluster_handler = cluster_handlers[0] - super().__init__(cluster_handlers, endpoint, device, **kwargs) + super().__init__(endpoint=endpoint, device=device, **kwargs) self._state: bool = self.is_on self.recompute_capabilities() + def _is_supported(self) -> bool: + if self._attribute_name not in self._cluster.attributes_by_name: + return False + return super()._is_supported() + def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) def _init_from_quirks_metadata(self, entity_metadata: BinarySensorMetadata) -> None: """Init this entity from the quirks metadata.""" @@ -135,30 +144,37 @@ def info_object(self) -> BinarySensorEntityInfo: @property def is_on(self) -> bool: """Return True if the switch is on based on the state machine.""" - self._state = raw_state = self._cluster_handler.cluster.get( - self._attribute_name - ) + self._state = raw_state = self._cluster.get(self._attribute_name) if raw_state is None: return False if self._attribute_converter: return self._attribute_converter(raw_state) return self.parse(raw_state) - def handle_cluster_handler_attribute_updated( - self, event: ClusterAttributeUpdatedEvent + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: - """Handle attribute updates from the cluster handler.""" + """Handle attribute updates from the cluster.""" if self._attribute_name is None or self._attribute_name != event.attribute_name: return - self._state = bool(event.attribute_value) + self._state = bool(event.value) self.maybe_emit_state_changed_event() async def async_update(self) -> None: """Attempt to retrieve on off state from the binary sensor.""" - await super().async_update() - attribute = getattr(self._cluster_handler, "value_attribute", "on_off") - # this is a cached read to get the value for state mgt so there is no double read - attr_value = await self._cluster_handler.get_attribute_value(attribute) + self.debug("polling current state") + attribute = self._attribute_name or "on_off" + result = await safe_read( + self._cluster, + [attribute], + allow_cache=False, + only_cache=False, + ) + attr_value = result.get(attribute) if attr_value is not None: self._state = attr_value self.maybe_emit_state_changed_event() @@ -177,10 +193,43 @@ class Accelerometer(BinarySensor): _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.MOVING _attr_translation_key: str = "accelerometer" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ACCELEROMETER}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({SMARTTHINGS_ACCELERATION_CLUSTER}), + manufacturers=frozenset({"CentraLite", "Samjin", "SmartThings"}), ) + _server_cluster_config = { + SMARTTHINGS_ACCELERATION_CLUSTER: ClusterConfig( + bind=True, + attributes={ + "acceleration": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=1, max_interval=900, reportable_change=1 + ), + ), + "x_axis": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=1, max_interval=900, reportable_change=1 + ), + ), + "y_axis": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=1, max_interval=900, reportable_change=1 + ), + ), + "z_axis": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=1, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } + @register_entity(OccupancySensing.cluster_id) class Occupancy(BinarySensor): @@ -189,11 +238,32 @@ class Occupancy(BinarySensor): _attribute_name = "occupancy" _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.OCCUPANCY _attr_primary_weight = 2 + _cluster_id = OccupancySensing.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_OCCUPANCY}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({OccupancySensing.cluster_id}), ) + _server_cluster_config = { + OccupancySensing.cluster_id: ClusterConfig( + bind=True, + attributes={ + OccupancySensing.AttributeDefs.occupancy: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + OccupancySensing.AttributeDefs.pir_o_to_u_delay: AttrConfig( + read_on_startup=False, + ), + OccupancySensing.AttributeDefs.pir_u_to_o_delay: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + @register_entity(OnOff.cluster_id) class Opening(BinarySensor): @@ -203,8 +273,8 @@ class Opening(BinarySensor): _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.OPENING _attr_primary_weight = 1 - _cluster_handler_match = ClusterHandlerMatch( - client_cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), + _cluster_match = ClusterMatch( + client_clusters=frozenset({OnOff.cluster_id}), not_profile_device_types=frozenset( { (zha.PROFILE_ID, zha.DeviceType.COLOR_CONTROLLER), @@ -234,18 +304,38 @@ class BinaryInputWithDescription(BinarySensor): """ZHA BinarySensor.""" _attribute_name = "present_value" + _cluster_id = BinaryInputCluster.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_BINARY_INPUT}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({BinaryInputCluster.cluster_id}), ) + _server_cluster_config = { + BinaryInputCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + BinaryInputCluster.AttributeDefs.present_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + BinaryInputCluster.AttributeDefs.description: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def recompute_capabilities(self) -> None: """Recompute capabilities.""" super().recompute_capabilities() - self._attr_fallback_name = self._cluster_handler.description + self._attr_fallback_name = self._cluster.get( + BinaryInputCluster.AttributeDefs.description.name + ) def _is_supported(self) -> bool: - if self._cluster_handler.description is None: + if self._cluster.get(BinaryInputCluster.AttributeDefs.description.name) is None: return False return super()._is_supported() @@ -257,14 +347,35 @@ class BinaryInput(BinarySensor): _attribute_name = "present_value" _attr_translation_key: str = "binary_input" + _cluster_id = BinaryInputCluster.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_BINARY_INPUT}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({BinaryInputCluster.cluster_id}), ) + _server_cluster_config = { + BinaryInputCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + BinaryInputCluster.AttributeDefs.present_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + BinaryInputCluster.AttributeDefs.description: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def _is_supported(self) -> bool: # Prefer to use the "WithDescription" variant above - if self._cluster_handler.description is not None: + if ( + self._cluster.get(BinaryInputCluster.AttributeDefs.description.name) + is not None + ): return False return super()._is_supported() @@ -278,8 +389,8 @@ class IkeaMotion(BinarySensor): _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.MOTION _attr_primary_weight = 1 - _cluster_handler_match = ClusterHandlerMatch( - client_cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), + _cluster_match = ClusterMatch( + client_clusters=frozenset({OnOff.cluster_id}), manufacturers=frozenset({"IKEA of Sweden"}), models=frozenset({"TRADFRI motion sensor"}), feature_priority=(PlatformFeatureGroup.BINARY_SENSOR, 1), @@ -294,8 +405,8 @@ class PhilipsMotion(BinarySensor): _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.MOTION _attr_primary_weight = 1 - _cluster_handler_match = ClusterHandlerMatch( - client_cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), + _cluster_match = ClusterMatch( + client_clusters=frozenset({OnOff.cluster_id}), manufacturers=frozenset({"Philips"}), models=frozenset({"SML001", "SML002"}), feature_priority=(PlatformFeatureGroup.BINARY_SENSOR, 1), @@ -308,17 +419,35 @@ class IASZone(BinarySensor): _attribute_name = "zone_status" _attr_primary_weight = 3 + _cluster_id = IasZone.cluster_id # TODO: split this sensor off into individual sensor classes per IASZone type - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ZONE}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({IasZone.cluster_id}), ) + _server_cluster_config = { + IasZone.cluster_id: ClusterConfig( + bind=True, + attributes={ + IasZone.AttributeDefs.zone_status: AttrConfig( + read_on_startup=True, + ), + IasZone.AttributeDefs.zone_state: AttrConfig( + read_on_startup=False, + ), + IasZone.AttributeDefs.zone_type: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def recompute_capabilities(self) -> None: """Recompute capabilities.""" super().recompute_capabilities() - zone_type = self._cluster_handler.cluster.get("zone_type") + zone_type = self._cluster.get(IasZone.AttributeDefs.zone_type.name) if zone_type is None: self._attr_translation_key = "ias_zone" @@ -338,7 +467,14 @@ def parse(value: bool | int) -> bool: async def async_update(self) -> None: """Attempt to retrieve on off state from the IAS Zone sensor.""" - await PlatformEntity.async_update(self) + self.debug("polling current state") + await safe_read( + self._cluster, + [self._attribute_name], + allow_cache=False, + only_cache=False, + ) + self.maybe_emit_state_changed_event() @register_entity(IasZone.cluster_id) @@ -348,9 +484,10 @@ class SinopeLeakStatus(BinarySensor): _attribute_name = "leak_status" _attr_device_class = BinarySensorDeviceClass.MOISTURE _attr_primary_weight = 1 + _cluster_id = IasZone.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ZONE}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({IasZone.cluster_id}), models=frozenset({"WL4200", "WL4200S"}), ) @@ -363,9 +500,10 @@ class FrostLock(BinarySensor): _unique_id_suffix = "frost_lock" _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.LOCK _attr_translation_key: str = "frost_lock" + _cluster_id = TUYA_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"tuya_manufacturer"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({TUYA_MANUFACTURER_CLUSTER}), manufacturers=frozenset({"_TZE200_htnnfasr"}), ) @@ -379,9 +517,10 @@ class ReplaceFilter(BinarySensor): _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.PROBLEM _attr_entity_category: EntityCategory = EntityCategory.DIAGNOSTIC _attr_translation_key: str = "replace_filter" + _cluster_id = IKEA_AIR_PURIFIER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"ikea_airpurifier"}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({IKEA_AIR_PURIFIER_CLUSTER}), ) @@ -392,9 +531,10 @@ class AqaraPetFeederErrorDetected(BinarySensor): _attribute_name = "error_detected" _unique_id_suffix = "error_detected" _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.PROBLEM + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"aqara.feeder.acn001"}), ) @@ -407,9 +547,10 @@ class XiaomiPlugConsumerConnected(BinarySensor): _unique_id_suffix = "consumer_connected" _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.PLUG _attr_translation_key: str = "consumer_connected" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.plug.mmeu01", "lumi.plug.maeu01"}), ) @@ -421,9 +562,10 @@ class AqaraThermostatWindowOpen(BinarySensor): _attribute_name = "window_open" _unique_id_suffix = "window_open" _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.WINDOW + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.airrtc.agl001"}), ) @@ -436,9 +578,10 @@ class AqaraThermostatValveAlarm(BinarySensor): _unique_id_suffix = "valve_alarm" _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.PROBLEM _attr_translation_key: str = "valve_alarm" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.airrtc.agl001"}), ) @@ -451,9 +594,10 @@ class AqaraThermostatCalibrated(BinarySensor): _unique_id_suffix = "calibrated" _attr_entity_category: EntityCategory = EntityCategory.DIAGNOSTIC _attr_translation_key: str = "calibrated" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.airrtc.agl001"}), ) @@ -466,9 +610,10 @@ class AqaraThermostatExternalSensor(BinarySensor): _unique_id_suffix = "sensor" _attr_entity_category: EntityCategory = EntityCategory.DIAGNOSTIC _attr_translation_key: str = "external_sensor" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.airrtc.agl001"}), ) @@ -481,9 +626,10 @@ class AqaraLinkageAlarmState(BinarySensor): _unique_id_suffix = "linkage_alarm_state" _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.SMOKE _attr_translation_key: str = "linkage_alarm_state" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.sensor_smoke.acn03"}), ) @@ -496,9 +642,10 @@ class AqaraE1CurtainMotorOpenedByHandBinarySensor(BinarySensor): _attribute_name = "hand_open" _attr_translation_key = "hand_open" _attr_entity_category = EntityCategory.DIAGNOSTIC + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.curtain.agl001"}), ) @@ -512,12 +659,27 @@ class DanfossMountingModeActive(BinarySensor): _attr_translation_key: str = "mounting_mode_active" _attr_device_class: BinarySensorDeviceClass = BinarySensorDeviceClass.OPENING _attr_entity_category = EntityCategory.DIAGNOSTIC + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "mounting_mode_active": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossHeatRequired(BinarySensor): @@ -526,12 +688,27 @@ class DanfossHeatRequired(BinarySensor): _unique_id_suffix = "heat_required" _attribute_name = "heat_required" _attr_translation_key: str = "heat_required" + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "heat_required": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=1, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossPreheatStatus(BinarySensor): @@ -542,8 +719,23 @@ class DanfossPreheatStatus(BinarySensor): _attr_translation_key: str = "preheat_status" _attr_entity_registry_enabled_default = False _attr_entity_category = EntityCategory.DIAGNOSTIC + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "preheat_status": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } diff --git a/zha/application/platforms/button/__init__.py b/zha/application/platforms/button/__init__.py index 64ce7c439..12d32a3fd 100644 --- a/zha/application/platforms/button/__init__.py +++ b/zha/application/platforms/button/__init__.py @@ -12,24 +12,22 @@ from zigpy.zcl.clusters.general import Identify from zha.application import Platform -from zha.application.const import ENTITY_METADATA +from zha.application.helpers import write_attributes_safe from zha.application.platforms import ( BaseEntity, BaseEntityInfo, - ClusterHandlerMatch, + ClusterMatch, EntityCategory, PlatformEntity, register_entity, ) from zha.application.platforms.button.const import DEFAULT_DURATION, ButtonDeviceClass -from zha.zigbee.cluster_handlers.const import ( +from zha.application.platforms.const import ( AQARA_OPPLE_CLUSTER, - CLUSTER_HANDLER_IDENTIFY, TUYA_MANUFACTURER_CLUSTER, ) if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint @@ -80,19 +78,6 @@ class Button(BaseButton): _args: list[Any] _kwargs: dict[str, Any] - def __init__( - self, - cluster_handlers: list[ClusterHandler], - endpoint: Endpoint, - device: Device, - **kwargs: Any, - ): - """Initialize button.""" - self._cluster_handler: ClusterHandler = cluster_handlers[0] - if ENTITY_METADATA in kwargs: - self._init_from_quirks_metadata(kwargs[ENTITY_METADATA]) - super().__init__(cluster_handlers, endpoint, device, **kwargs) - def _init_from_quirks_metadata( self, entity_metadata: ZCLCommandButtonMetadata ) -> None: @@ -124,7 +109,7 @@ def kwargs(self) -> dict[str, Any]: async def async_press(self) -> None: """Send out a update command.""" - command = getattr(self._cluster_handler, self._command_name) + command = getattr(self._cluster, self._command_name) arguments = self.args or [] kwargs = self.kwargs or {} await command(*arguments, **kwargs) @@ -139,9 +124,10 @@ class IdentifyButton(Button): _command_name = "identify" _kwargs = {} _args = [DEFAULT_DURATION] + _cluster_id = Identify.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_IDENTIFY}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({Identify.cluster_id}), ) def is_supported_in_list(self, entities: list[BaseEntity]) -> bool: @@ -158,16 +144,12 @@ class WriteAttributeButton(BaseButton): def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Init this button.""" - self._cluster_handler: ClusterHandler = cluster_handlers[0] - if ENTITY_METADATA in kwargs: - self._init_from_quirks_metadata(kwargs[ENTITY_METADATA]) - super().__init__(cluster_handlers, endpoint, device, **kwargs) + super().__init__(endpoint=endpoint, device=device, **kwargs) self.recompute_capabilities() def _init_from_quirks_metadata( @@ -189,8 +171,8 @@ def info_object(self) -> WriteAttributeButtonEntityInfo: async def async_press(self) -> None: """Write attribute with defined value.""" - await self._cluster_handler.write_attributes_safe( - {self._attribute_name: self._attribute_value} + await write_attributes_safe( + self._cluster, {self._attribute_name: self._attribute_value} ) @@ -204,9 +186,10 @@ class FrostLockResetButton(WriteAttributeButton): _attr_device_class = ButtonDeviceClass.RESTART _attr_entity_category = EntityCategory.CONFIG _attr_translation_key = "reset_frost_lock" + _cluster_id = TUYA_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"tuya_manufacturer"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({TUYA_MANUFACTURER_CLUSTER}), manufacturers=frozenset({"_TZE200_htnnfasr"}), ) @@ -221,9 +204,10 @@ class NoPresenceStatusResetButton(WriteAttributeButton): _attr_device_class = ButtonDeviceClass.RESTART _attr_entity_category = EntityCategory.CONFIG _attr_translation_key = "reset_no_presence_status" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.motion.ac01"}), ) @@ -236,9 +220,10 @@ class AqaraPetFeederFeedButton(WriteAttributeButton): _attribute_name = "feeding" _attribute_value = 1 _attr_translation_key = "feed" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"aqara.feeder.acn001"}), ) @@ -252,8 +237,9 @@ class AqaraSelfTestButton(WriteAttributeButton): _attribute_value = 1 _attr_entity_category = EntityCategory.CONFIG _attr_translation_key = "self_test" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.sensor_smoke.acn03"}), ) diff --git a/zha/application/platforms/climate/__init__.py b/zha/application/platforms/climate/__init__.py index 4cc8d37a5..6e5d9a27a 100644 --- a/zha/application/platforms/climate/__init__.py +++ b/zha/application/platforms/climate/__init__.py @@ -7,10 +7,18 @@ from dataclasses import dataclass import datetime as dt import functools -from typing import TYPE_CHECKING, Any, cast +from typing import TYPE_CHECKING, Any from zigpy.profiles import zha +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, +) from zigpy.zcl.clusters.hvac import ( + Fan as FanCluster, FanMode, RunningState, SystemMode, @@ -18,9 +26,12 @@ ) from zha.application import Platform +from zha.application.helpers import write_attributes_safe from zha.application.platforms import ( + AttrConfig, BaseEntityInfo, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, PlatformEntity, PlatformFeatureGroup, register_entity, @@ -48,16 +59,8 @@ ) from zha.decorators import periodic from zha.units import UnitOfTemperature -from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_FAN, - CLUSTER_HANDLER_THERMOSTAT, -) -from zha.zigbee.cluster_handlers.hvac import FanClusterHandler, ThermostatClusterHandler if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint @@ -215,16 +218,139 @@ class Thermostat(BaseThermostat): ATTR_UNOCCP_HEAT_SETPT, } - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), - optional_cluster_handlers=frozenset({CLUSTER_HANDLER_FAN}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({ThermostatCluster.cluster_id}), + optional_server_clusters=frozenset({FanCluster.cluster_id}), # We prefer Thermostat entities over Fan entities if possible feature_priority=(PlatformFeatureGroup.THERMOSTAT_FAN, 1), ) + _server_cluster_config = { + ThermostatCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + ThermostatCluster.AttributeDefs.local_temperature: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + ThermostatCluster.AttributeDefs.occupied_cooling_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + ThermostatCluster.AttributeDefs.occupied_heating_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + ThermostatCluster.AttributeDefs.unoccupied_cooling_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + ThermostatCluster.AttributeDefs.unoccupied_heating_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + ThermostatCluster.AttributeDefs.running_mode: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + ThermostatCluster.AttributeDefs.running_state: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + ThermostatCluster.AttributeDefs.system_mode: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + ThermostatCluster.AttributeDefs.occupancy: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + ThermostatCluster.AttributeDefs.pi_cooling_demand: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=5 + ), + ), + ThermostatCluster.AttributeDefs.pi_heating_demand: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=5 + ), + ), + ThermostatCluster.AttributeDefs.abs_min_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + ThermostatCluster.AttributeDefs.abs_max_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + ThermostatCluster.AttributeDefs.abs_min_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + ThermostatCluster.AttributeDefs.abs_max_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + ThermostatCluster.AttributeDefs.ctrl_sequence_of_oper: AttrConfig( + read_on_startup=True, + ), + ThermostatCluster.AttributeDefs.max_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + ThermostatCluster.AttributeDefs.max_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + ThermostatCluster.AttributeDefs.min_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + ThermostatCluster.AttributeDefs.min_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + ThermostatCluster.AttributeDefs.local_temperature_calibration: AttrConfig( + read_on_startup=False, + ), + ThermostatCluster.AttributeDefs.setpoint_change_source: AttrConfig( + read_on_startup=False, + ), + ThermostatCluster.AttributeDefs.setpoint_change_source_timestamp: AttrConfig( + read_on_startup=False, + ), + }, + ), + FanCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + FanCluster.AttributeDefs.fan_mode: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + FanCluster.AttributeDefs.fan_mode_sequence: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs, @@ -236,25 +362,158 @@ def __init__( else f"{endpoint.device.ieee}-{endpoint.id}-{int(ThermostatCluster.cluster_id)}" ) super().__init__( - cluster_handlers, - endpoint, - device, + endpoint=endpoint, + device=device, **kwargs, legacy_discovery_unique_id=legacy_discovery_unique_id, ) self._preset: Preset | str = Preset.NONE self._presets: list[Preset | str] = [] - self._thermostat_cluster_handler: ThermostatClusterHandler = cast( - ThermostatClusterHandler, self.cluster_handlers[CLUSTER_HANDLER_THERMOSTAT] - ) - self._fan_cluster_handler: FanClusterHandler | None = cast( - FanClusterHandler | None, self.cluster_handlers.get(CLUSTER_HANDLER_FAN) + self._cluster = endpoint.zigpy_endpoint.in_clusters[ + ThermostatCluster.cluster_id + ] + self._fan_cluster = endpoint.zigpy_endpoint.in_clusters.get( + FanCluster.cluster_id ) self._supported_features = ClimateEntityFeature(0) self.recompute_capabilities() + @property + def _local_temperature(self) -> int | None: + return self._cluster.get(ThermostatCluster.AttributeDefs.local_temperature.name) + + @property + def _outdoor_temperature(self) -> int | None: + return self._cluster.get( + ThermostatCluster.AttributeDefs.outdoor_temperature.name + ) + + @property + def _occupancy(self) -> int | None: + return self._cluster.get(ThermostatCluster.AttributeDefs.occupancy.name) + + @property + def _occupied_cooling_setpoint(self) -> int | None: + return self._cluster.get( + ThermostatCluster.AttributeDefs.occupied_cooling_setpoint.name + ) + + @property + def _occupied_heating_setpoint(self) -> int | None: + return self._cluster.get( + ThermostatCluster.AttributeDefs.occupied_heating_setpoint.name + ) + + @property + def _unoccupied_cooling_setpoint(self) -> int | None: + return self._cluster.get( + ThermostatCluster.AttributeDefs.unoccupied_cooling_setpoint.name + ) + + @property + def _unoccupied_heating_setpoint(self) -> int | None: + return self._cluster.get( + ThermostatCluster.AttributeDefs.unoccupied_heating_setpoint.name + ) + + @property + def _pi_cooling_demand(self) -> int | None: + return self._cluster.get(ThermostatCluster.AttributeDefs.pi_cooling_demand.name) + + @property + def _pi_heating_demand(self) -> int | None: + return self._cluster.get(ThermostatCluster.AttributeDefs.pi_heating_demand.name) + + @property + def _running_mode(self) -> int | None: + return self._cluster.get(ThermostatCluster.AttributeDefs.running_mode.name) + + @property + def _running_state(self) -> int | None: + return self._cluster.get(ThermostatCluster.AttributeDefs.running_state.name) + + @property + def _system_mode(self) -> int | None: + return self._cluster.get(ThermostatCluster.AttributeDefs.system_mode.name) + + @property + def _ctrl_sequence_of_oper(self) -> int: + return self._cluster.get( + ThermostatCluster.AttributeDefs.ctrl_sequence_of_oper.name, 0xFF + ) + + @property + def _abs_max_cool_setpoint_limit(self) -> int: + return self._cluster.get( + ThermostatCluster.AttributeDefs.abs_max_cool_setpoint_limit.name, 3200 + ) + + @property + def _abs_min_cool_setpoint_limit(self) -> int: + return self._cluster.get( + ThermostatCluster.AttributeDefs.abs_min_cool_setpoint_limit.name, 1600 + ) + + @property + def _abs_max_heat_setpoint_limit(self) -> int: + return self._cluster.get( + ThermostatCluster.AttributeDefs.abs_max_heat_setpoint_limit.name, 3000 + ) + + @property + def _abs_min_heat_setpoint_limit(self) -> int: + return self._cluster.get( + ThermostatCluster.AttributeDefs.abs_min_heat_setpoint_limit.name, 700 + ) + + @property + def _max_cool_setpoint_limit(self) -> int: + sp_limit = self._cluster.get( + ThermostatCluster.AttributeDefs.max_cool_setpoint_limit.name + ) + if sp_limit is None: + return self._abs_max_cool_setpoint_limit + return sp_limit + + @property + def _min_cool_setpoint_limit(self) -> int: + sp_limit = self._cluster.get( + ThermostatCluster.AttributeDefs.min_cool_setpoint_limit.name + ) + if sp_limit is None: + return self._abs_min_cool_setpoint_limit + return sp_limit + + @property + def _max_heat_setpoint_limit(self) -> int: + sp_limit = self._cluster.get( + ThermostatCluster.AttributeDefs.max_heat_setpoint_limit.name + ) + if sp_limit is None: + return self._abs_max_heat_setpoint_limit + return sp_limit + + @property + def _min_heat_setpoint_limit(self) -> int: + sp_limit = self._cluster.get( + ThermostatCluster.AttributeDefs.min_heat_setpoint_limit.name + ) + if sp_limit is None: + return self._abs_min_heat_setpoint_limit + return sp_limit + + async def _async_get_occupancy(self) -> bool | None: + """Get unreportable occupancy attribute.""" + res, fail = await self._cluster.read_attributes( + [ThermostatCluster.AttributeDefs.occupancy.name] + ) + self.debug("read 'occupancy' attr, success: %s, fail: %s", res, fail) + if ThermostatCluster.AttributeDefs.occupancy.name not in res: + return None + return bool(self._occupancy) + def recompute_capabilities(self) -> None: """Recompute capabilities and feature flags.""" super().recompute_capabilities() @@ -267,18 +526,23 @@ def recompute_capabilities(self) -> None: if HVACMode.HEAT_COOL in self.hvac_modes: self._supported_features |= ClimateEntityFeature.TARGET_TEMPERATURE_RANGE - if self._fan_cluster_handler is not None: + if self._fan_cluster is not None: self._supported_features |= ClimateEntityFeature.FAN_MODE def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._thermostat_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) @functools.cached_property def info_object(self) -> ThermostatEntityInfo: @@ -296,46 +560,46 @@ def info_object(self) -> ThermostatEntityInfo: @property def state(self) -> dict[str, Any]: """Get the state of the thermostat.""" - thermostat = self._thermostat_cluster_handler - system_mode = SYSTEM_MODE_2_HVAC.get(thermostat.system_mode, "unknown") + system_mode = SYSTEM_MODE_2_HVAC.get(self._system_mode, "unknown") response = super().state response[ATTR_SYS_MODE] = ( - f"[{thermostat.system_mode}]/{system_mode}" + f"[{self._system_mode}]/{system_mode}" if self.hvac_mode is not None else None ) - response[ATTR_OCCUPANCY] = thermostat.occupancy - response[ATTR_OCCP_COOL_SETPT] = thermostat.occupied_cooling_setpoint - response[ATTR_OCCP_HEAT_SETPT] = thermostat.occupied_heating_setpoint - response[ATTR_PI_HEATING_DEMAND] = thermostat.pi_heating_demand - response[ATTR_PI_COOLING_DEMAND] = thermostat.pi_cooling_demand - response[ATTR_UNOCCP_COOL_SETPT] = thermostat.unoccupied_cooling_setpoint - response[ATTR_UNOCCP_HEAT_SETPT] = thermostat.unoccupied_heating_setpoint + response[ATTR_OCCUPANCY] = self._occupancy + response[ATTR_OCCP_COOL_SETPT] = self._occupied_cooling_setpoint + response[ATTR_OCCP_HEAT_SETPT] = self._occupied_heating_setpoint + response[ATTR_PI_HEATING_DEMAND] = self._pi_heating_demand + response[ATTR_PI_COOLING_DEMAND] = self._pi_cooling_demand + response[ATTR_UNOCCP_COOL_SETPT] = self._unoccupied_cooling_setpoint + response[ATTR_UNOCCP_HEAT_SETPT] = self._unoccupied_heating_setpoint return response @property def current_temperature(self): """Return the current temperature.""" - if self._thermostat_cluster_handler.local_temperature is None: + if self._local_temperature is None: return None - return self._thermostat_cluster_handler.local_temperature / ZCL_TEMP + return self._local_temperature / ZCL_TEMP @property def outdoor_temperature(self): """Return the outdoor temperature.""" - if self._thermostat_cluster_handler.outdoor_temperature is None: + if self._outdoor_temperature is None: return None - return self._thermostat_cluster_handler.outdoor_temperature / ZCL_TEMP + return self._outdoor_temperature / ZCL_TEMP @property def fan_mode(self) -> str | None: """Return current FAN mode.""" - if self._thermostat_cluster_handler.running_state is None: + running_state = self._running_state + if running_state is None: return FAN_AUTO - if self._thermostat_cluster_handler.running_state & ( + if running_state & ( RunningState.Fan_State_On | RunningState.Fan_2nd_Stage_On | RunningState.Fan_3rd_Stage_On @@ -346,17 +610,14 @@ def fan_mode(self) -> str | None: @functools.cached_property def fan_modes(self) -> list[str] | None: """Return supported FAN modes.""" - if not self._fan_cluster_handler: + if self._fan_cluster is None: return None return [FAN_AUTO, FAN_ON] @property def hvac_action(self) -> HVACAction | None: """Return the current HVAC action.""" - if ( - self._thermostat_cluster_handler.pi_heating_demand is None - and self._thermostat_cluster_handler.pi_cooling_demand is None - ): + if self._pi_heating_demand is None and self._pi_cooling_demand is None: return self._rm_rs_action return self._pi_demand_action @@ -364,7 +625,7 @@ def hvac_action(self) -> HVACAction | None: def _rm_rs_action(self) -> HVACAction | None: """Return the current HVAC action based on running mode and running state.""" - if (running_state := self._thermostat_cluster_handler.running_state) is None: + if (running_state := self._running_state) is None: return None if running_state & ( RunningState.Heat_State_On | RunningState.Heat_2nd_Stage_On @@ -390,10 +651,10 @@ def _rm_rs_action(self) -> HVACAction | None: def _pi_demand_action(self) -> HVACAction | None: """Return the current HVAC action based on pi_demands.""" - heating_demand = self._thermostat_cluster_handler.pi_heating_demand + heating_demand = self._pi_heating_demand if heating_demand is not None and heating_demand > 0: return HVACAction.HEATING - cooling_demand = self._thermostat_cluster_handler.pi_cooling_demand + cooling_demand = self._pi_cooling_demand if cooling_demand is not None and cooling_demand > 0: return HVACAction.COOLING @@ -404,14 +665,12 @@ def _pi_demand_action(self) -> HVACAction | None: @property def hvac_mode(self) -> HVACMode | None: """Return HVAC operation mode.""" - return SYSTEM_MODE_2_HVAC.get(self._thermostat_cluster_handler.system_mode) + return SYSTEM_MODE_2_HVAC.get(self._system_mode) @property def hvac_modes(self) -> list[HVACMode]: """Return the list of available HVAC operation modes.""" - return SEQ_OF_OPERATION.get( - self._thermostat_cluster_handler.ctrl_sequence_of_oper, [HVACMode.OFF] - ) + return SEQ_OF_OPERATION.get(self._ctrl_sequence_of_oper, [HVACMode.OFF]) @property def preset_mode(self) -> str: @@ -434,14 +693,14 @@ def target_temperature(self): temp = None if self.hvac_mode == HVACMode.COOL: if self.preset_mode == Preset.AWAY: - temp = self._thermostat_cluster_handler.unoccupied_cooling_setpoint + temp = self._unoccupied_cooling_setpoint else: - temp = self._thermostat_cluster_handler.occupied_cooling_setpoint + temp = self._occupied_cooling_setpoint elif self.hvac_mode == HVACMode.HEAT: if self.preset_mode == Preset.AWAY: - temp = self._thermostat_cluster_handler.unoccupied_heating_setpoint + temp = self._unoccupied_heating_setpoint else: - temp = self._thermostat_cluster_handler.occupied_heating_setpoint + temp = self._occupied_heating_setpoint if temp is None: return temp return round(temp / ZCL_TEMP, 1) @@ -452,9 +711,9 @@ def target_temperature_high(self): if self.hvac_mode != HVACMode.HEAT_COOL: return None if self.preset_mode == Preset.AWAY: - temp = self._thermostat_cluster_handler.unoccupied_cooling_setpoint + temp = self._unoccupied_cooling_setpoint else: - temp = self._thermostat_cluster_handler.occupied_cooling_setpoint + temp = self._occupied_cooling_setpoint if temp is None: return temp @@ -467,9 +726,9 @@ def target_temperature_low(self): if self.hvac_mode != HVACMode.HEAT_COOL: return None if self.preset_mode == Preset.AWAY: - temp = self._thermostat_cluster_handler.unoccupied_heating_setpoint + temp = self._unoccupied_heating_setpoint else: - temp = self._thermostat_cluster_handler.occupied_heating_setpoint + temp = self._occupied_heating_setpoint if temp is None: return temp @@ -480,9 +739,9 @@ def max_temp(self) -> float: """Return the maximum temperature.""" temps = [] if HVACMode.HEAT in self.hvac_modes: - temps.append(self._thermostat_cluster_handler.max_heat_setpoint_limit) + temps.append(self._max_heat_setpoint_limit) if HVACMode.COOL in self.hvac_modes: - temps.append(self._thermostat_cluster_handler.max_cool_setpoint_limit) + temps.append(self._max_cool_setpoint_limit) if not temps: return self.DEFAULT_MAX_TEMP @@ -493,45 +752,49 @@ def min_temp(self) -> float: """Return the minimum temperature.""" temps = [] if HVACMode.HEAT in self.hvac_modes: - temps.append(self._thermostat_cluster_handler.min_heat_setpoint_limit) + temps.append(self._min_heat_setpoint_limit) if HVACMode.COOL in self.hvac_modes: - temps.append(self._thermostat_cluster_handler.min_cool_setpoint_limit) + temps.append(self._min_cool_setpoint_limit) if not temps: return self.DEFAULT_MIN_TEMP return round(min(temps) / ZCL_TEMP, 1) - def handle_cluster_handler_attribute_updated( - self, event: ClusterAttributeUpdatedEvent + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: """Handle attribute update from device.""" - self.device.gateway.async_create_task( - self._handle_cluster_handler_attribute_updated(event) - ) + self.device.gateway.async_create_task(self._handle_attribute_updated(event)) - async def _handle_cluster_handler_attribute_updated( - self, event: ClusterAttributeUpdatedEvent + async def _handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: """Handle attribute update from device.""" if ( event.attribute_name in (ATTR_OCCP_COOL_SETPT, ATTR_OCCP_HEAT_SETPT) and self.preset_mode == Preset.AWAY - and await self._thermostat_cluster_handler.get_occupancy() is True + and await self._async_get_occupancy() is True ): # occupancy attribute is an unreportable attribute, but if we get # an attribute update for an "occupied" setpoint, there's a chance # occupancy has changed self._preset = Preset.NONE - self.debug( - "Attribute '%s' = %s update", event.attribute_name, event.attribute_value - ) + self.debug("Attribute '%s' = %s update", event.attribute_name, event.value) self.maybe_emit_state_changed_event() async def async_set_fan_mode(self, fan_mode: str) -> None: """Set fan mode.""" - if self._fan_cluster_handler is None: - self.warning("Fan cluster handler is not available") + if self._fan_cluster is None: + self.warning("Fan cluster is not available") return if not self.fan_modes or fan_mode not in self.fan_modes: @@ -540,7 +803,9 @@ async def async_set_fan_mode(self, fan_mode: str) -> None: mode = FanMode.On if fan_mode == FAN_ON else FanMode.Auto - await self._fan_cluster_handler.async_set_speed(mode) + await write_attributes_safe( + self._fan_cluster, {FanCluster.AttributeDefs.fan_mode.name: mode} + ) async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: """Set new target operation mode.""" @@ -552,10 +817,15 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: ) return - if await self._thermostat_cluster_handler.async_set_operation_mode( - HVAC_MODE_2_SYSTEM[hvac_mode] - ): - self.maybe_emit_state_changed_event() + await write_attributes_safe( + self._cluster, + { + ThermostatCluster.AttributeDefs.system_mode.name: HVAC_MODE_2_SYSTEM[ + hvac_mode + ] + }, + ) + self.maybe_emit_state_changed_event() async def async_set_preset_mode(self, preset_mode: str) -> None: """Set new preset mode.""" @@ -575,6 +845,26 @@ async def async_set_preset_mode(self, preset_mode: str) -> None: self._preset = preset_mode self.maybe_emit_state_changed_event() + async def _async_set_heating_setpoint( + self, temperature: int, is_away: bool + ) -> None: + attr = ( + ThermostatCluster.AttributeDefs.unoccupied_heating_setpoint.name + if is_away + else ThermostatCluster.AttributeDefs.occupied_heating_setpoint.name + ) + await write_attributes_safe(self._cluster, {attr: temperature}) + + async def _async_set_cooling_setpoint( + self, temperature: int, is_away: bool + ) -> None: + attr = ( + ThermostatCluster.AttributeDefs.unoccupied_cooling_setpoint.name + if is_away + else ThermostatCluster.AttributeDefs.occupied_cooling_setpoint.name + ) + await write_attributes_safe(self._cluster, {attr: temperature}) + async def async_set_temperature( self, target_temp_low: float | None = None, @@ -590,23 +880,23 @@ async def async_set_temperature( if self.hvac_mode == HVACMode.HEAT_COOL: if target_temp_low is not None: - await self._thermostat_cluster_handler.async_set_heating_setpoint( + await self._async_set_heating_setpoint( temperature=int(target_temp_low * ZCL_TEMP), is_away=is_away, ) if target_temp_high is not None: - await self._thermostat_cluster_handler.async_set_cooling_setpoint( + await self._async_set_cooling_setpoint( temperature=int(target_temp_high * ZCL_TEMP), is_away=is_away, ) elif temperature is not None: if self.hvac_mode == HVACMode.COOL: - await self._thermostat_cluster_handler.async_set_cooling_setpoint( + await self._async_set_cooling_setpoint( temperature=int(temperature * ZCL_TEMP), is_away=is_away, ) elif self.hvac_mode == HVACMode.HEAT: - await self._thermostat_cluster_handler.async_set_heating_setpoint( + await self._async_set_heating_setpoint( temperature=int(temperature * ZCL_TEMP), is_away=is_away, ) @@ -626,6 +916,9 @@ async def async_preset_handler(self, preset: str, enable: bool = False) -> None: await handler(enable) +SINOPE_MANUFACTURER_CLUSTER = 0xFF01 + + @register_entity(ThermostatCluster.cluster_id) class SinopeTechnologiesThermostat(Thermostat): """Sinope Technologies Thermostat.""" @@ -633,24 +926,25 @@ class SinopeTechnologiesThermostat(Thermostat): manufacturer = 0x119C __polling_interval: int - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset( - {CLUSTER_HANDLER_THERMOSTAT, "sinope_manufacturer_specific"} + _cluster_match = ClusterMatch( + server_clusters=frozenset( + {ThermostatCluster.cluster_id, SINOPE_MANUFACTURER_CLUSTER} ), manufacturers=frozenset({"Sinope Technologies"}), ) def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs, ): """Initialize ZHA Thermostat instance.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) + super().__init__(endpoint=endpoint, device=device, **kwargs) self._presets = [Preset.AWAY, Preset.NONE] - self._manufacturer_ch = self.cluster_handlers["sinope_manufacturer_specific"] + self._sinope_cluster = endpoint.zigpy_endpoint.in_clusters[ + SINOPE_MANUFACTURER_CLUSTER + ] self._time_update_task: Task | None = None def recompute_capabilities(self) -> None: @@ -698,13 +992,13 @@ async def _update_time(self) -> None: def _rm_rs_action(self) -> HVACAction: """Return the current HVAC action based on running mode and running state.""" - running_mode = self._thermostat_cluster_handler.running_mode + running_mode = self._running_mode if running_mode == SystemMode.Heat: return HVACAction.HEATING if running_mode == SystemMode.Cool: return HVACAction.COOLING - running_state = self._thermostat_cluster_handler.running_state + running_state = self._running_state if running_state and running_state & ( RunningState.Fan_State_On | RunningState.Fan_2nd_Stage_On @@ -724,15 +1018,19 @@ async def _async_update_time(self) -> None: ).total_seconds() self.debug("Updating time: %s", secs_2k) - await self._manufacturer_ch.write_attributes_safe( - {"secs_since_2k": secs_2k}, manufacturer=self.manufacturer + await write_attributes_safe( + self._sinope_cluster, + {"secs_since_2k": secs_2k}, + manufacturer=self.manufacturer, ) async def async_preset_handler_away(self, is_away: bool = False) -> None: """Set occupancy.""" mfg_code = self._device.manufacturer_code - await self._thermostat_cluster_handler.write_attributes_safe( - {"set_occupancy": 0 if is_away else 1}, manufacturer=mfg_code + await write_attributes_safe( + self._cluster, + {"set_occupancy": 0 if is_away else 1}, + manufacturer=mfg_code, ) @@ -740,9 +1038,9 @@ async def async_preset_handler_away(self, is_away: bool = False) -> None: class ZenWithinThermostat(Thermostat): """Zen Within Thermostat implementation.""" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), - optional_cluster_handlers=frozenset({CLUSTER_HANDLER_FAN}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({ThermostatCluster.cluster_id}), + optional_server_clusters=frozenset({FanCluster.cluster_id}), manufacturers=frozenset({"Zen Within", "LUX"}), feature_priority=(PlatformFeatureGroup.THERMOSTAT_FAN, 2), ) @@ -752,8 +1050,8 @@ class ZenWithinThermostat(Thermostat): class ZehnderThermostat(Thermostat): """Zehnder thermostat to adapt AUTO mode behavior.""" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({ThermostatCluster.cluster_id}), manufacturers=frozenset( {"ZEHNDER GROUP VAUX ANDIGNY ", "ZEHNDER GROUP VAUX ANDIGNY"} ), @@ -782,10 +1080,15 @@ async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None: ) return - if await self._thermostat_cluster_handler.async_set_operation_mode( - ZehnderThermostat.ZEHNDER_HVAC_MODE_2_SYSTEM[hvac_mode] - ): - self.maybe_emit_state_changed_event() + await write_attributes_safe( + self._cluster, + { + ThermostatCluster.AttributeDefs.system_mode.name: ZehnderThermostat.ZEHNDER_HVAC_MODE_2_SYSTEM[ + hvac_mode + ] + }, + ) + self.maybe_emit_state_changed_event() @property def current_temperature(self): @@ -795,15 +1098,14 @@ def current_temperature(self): @property def state(self) -> dict[str, Any]: """Get the state of the lock.""" - thermostat = self._thermostat_cluster_handler system_mode = ZehnderThermostat.ZEHNDER_SYSTEM_MODE_2_HVAC.get( - thermostat.system_mode, "unknown" + self._system_mode, "unknown" ) response = super().state response[ATTR_SYS_MODE] = ( - f"[{thermostat.system_mode}]/{system_mode}" + f"[{self._system_mode}]/{system_mode}" if self.hvac_mode is not None else None ) @@ -813,18 +1115,16 @@ def state(self) -> dict[str, Any]: @property def hvac_mode(self) -> HVACMode | None: """Return HVAC operation mode.""" - return ZehnderThermostat.ZEHNDER_SYSTEM_MODE_2_HVAC.get( - self._thermostat_cluster_handler.system_mode - ) + return ZehnderThermostat.ZEHNDER_SYSTEM_MODE_2_HVAC.get(self._system_mode) @register_entity(ThermostatCluster.cluster_id) class CentralitePearl(Thermostat): """Centralite Pearl Thermostat implementation.""" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), - optional_cluster_handlers=frozenset({CLUSTER_HANDLER_FAN}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({ThermostatCluster.cluster_id}), + optional_server_clusters=frozenset({FanCluster.cluster_id}), manufacturers=frozenset({"Centralite"}), models=frozenset({"3157100", "3157100-E"}), feature_priority=(PlatformFeatureGroup.THERMOSTAT_FAN, 2), @@ -854,8 +1154,8 @@ class CentralitePearl(Thermostat): class MoesThermostat(Thermostat): """Moes Thermostat implementation.""" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({ThermostatCluster.cluster_id}), manufacturers=MOES_MANUFACTURERS, feature_priority=(PlatformFeatureGroup.THERMOSTAT_FAN, 2), ) @@ -879,57 +1179,61 @@ def hvac_modes(self) -> list[HVACMode]: """Return only the heat mode, because the device can't be turned off.""" return [HVACMode.HEAT] - def handle_cluster_handler_attribute_updated( - self, event: ClusterAttributeUpdatedEvent + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: """Handle attribute update from device.""" if event.attribute_name == "operation_preset": - if event.attribute_value == 0: + if event.value == 0: self._preset = Preset.AWAY - if event.attribute_value == 1: + if event.value == 1: self._preset = Preset.SCHEDULE - if event.attribute_value == 2: + if event.value == 2: self._preset = Preset.NONE - if event.attribute_value == 3: + if event.value == 3: self._preset = Preset.COMFORT - if event.attribute_value == 4: + if event.value == 4: self._preset = Preset.ECO - if event.attribute_value == 5: + if event.value == 5: self._preset = Preset.BOOST - if event.attribute_value == 6: + if event.value == 6: self._preset = Preset.COMPLEX - super().handle_cluster_handler_attribute_updated(event) + super().handle_attribute_updated(event) async def async_preset_handler(self, preset: str, enable: bool = False) -> None: """Set the preset mode.""" mfg_code = self._device.manufacturer_code if not enable: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 2}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 2}, manufacturer=mfg_code ) if preset == Preset.AWAY: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 0}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 0}, manufacturer=mfg_code ) if preset == Preset.SCHEDULE: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 1}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 1}, manufacturer=mfg_code ) if preset == Preset.COMFORT: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 3}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 3}, manufacturer=mfg_code ) if preset == Preset.ECO: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 4}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 4}, manufacturer=mfg_code ) if preset == Preset.BOOST: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 5}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 5}, manufacturer=mfg_code ) if preset == Preset.COMPLEX: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 6}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 6}, manufacturer=mfg_code ) @@ -937,8 +1241,8 @@ async def async_preset_handler(self, preset: str, enable: bool = False) -> None: class BecaThermostat(Thermostat): """Beca Thermostat implementation.""" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({ThermostatCluster.cluster_id}), manufacturers=frozenset({"_TZE200_b6wax7g0"}), feature_priority=(PlatformFeatureGroup.THERMOSTAT_FAN, 2), ) @@ -961,51 +1265,55 @@ def hvac_modes(self) -> list[HVACMode]: """Return only the heat mode, because the device can't be turned off.""" return [HVACMode.HEAT] - def handle_cluster_handler_attribute_updated( - self, event: ClusterAttributeUpdatedEvent + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: """Handle attribute update from device.""" if event.attribute_name == "operation_preset": - if event.attribute_value == 0: + if event.value == 0: self._preset = Preset.AWAY - if event.attribute_value == 1: + if event.value == 1: self._preset = Preset.SCHEDULE - if event.attribute_value == 2: + if event.value == 2: self._preset = Preset.NONE - if event.attribute_value == 4: + if event.value == 4: self._preset = Preset.ECO - if event.attribute_value == 5: + if event.value == 5: self._preset = Preset.BOOST - if event.attribute_value == 7: + if event.value == 7: self._preset = Preset.TEMP_MANUAL - super().handle_cluster_handler_attribute_updated(event) + super().handle_attribute_updated(event) async def async_preset_handler(self, preset: str, enable: bool = False) -> None: """Set the preset mode.""" mfg_code = self._device.manufacturer_code if not enable: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 2}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 2}, manufacturer=mfg_code ) if preset == Preset.AWAY: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 0}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 0}, manufacturer=mfg_code ) if preset == Preset.SCHEDULE: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 1}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 1}, manufacturer=mfg_code ) if preset == Preset.ECO: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 4}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 4}, manufacturer=mfg_code ) if preset == Preset.BOOST: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 5}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 5}, manufacturer=mfg_code ) if preset == Preset.TEMP_MANUAL: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 7}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 7}, manufacturer=mfg_code ) @@ -1013,8 +1321,8 @@ async def async_preset_handler(self, preset: str, enable: bool = False) -> None: class StelproFanHeater(Thermostat): """Stelpro Fan Heater implementation.""" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({ThermostatCluster.cluster_id}), manufacturers=frozenset({"Stelpro"}), models=frozenset({"SORB"}), feature_priority=(PlatformFeatureGroup.THERMOSTAT_FAN, 2), @@ -1051,8 +1359,8 @@ class ZONNSMARTThermostat(Thermostat): PRESET_HOLIDAY = "holiday" PRESET_FROST = "frost protect" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({ThermostatCluster.cluster_id}), manufacturers=ZONNSMART_MANUFACTURERS, feature_priority=(PlatformFeatureGroup.THERMOSTAT_FAN, 2), ) @@ -1068,37 +1376,41 @@ def recompute_capabilities(self) -> None: ] self._supported_features |= ClimateEntityFeature.PRESET_MODE - def handle_cluster_handler_attribute_updated( - self, event: ClusterAttributeUpdatedEvent + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: """Handle attribute update from device.""" if event.attribute_name == "operation_preset": - if event.attribute_value == 0: + if event.value == 0: self._preset = Preset.SCHEDULE - if event.attribute_value == 1: + if event.value == 1: self._preset = Preset.NONE - if event.attribute_value in (2, 3): + if event.value in (2, 3): self._preset = self.PRESET_HOLIDAY - if event.attribute_value == 4: + if event.value == 4: self._preset = self.PRESET_FROST - super().handle_cluster_handler_attribute_updated(event) + super().handle_attribute_updated(event) async def async_preset_handler(self, preset: str, enable: bool = False) -> None: """Set the preset mode.""" mfg_code = self._device.manufacturer_code if not enable: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 1}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 1}, manufacturer=mfg_code ) if preset == Preset.SCHEDULE: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 0}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 0}, manufacturer=mfg_code ) if preset == self.PRESET_HOLIDAY: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 3}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 3}, manufacturer=mfg_code ) if preset == self.PRESET_FROST: - return await self._thermostat_cluster_handler.write_attributes_safe( - {"operation_preset": 4}, manufacturer=mfg_code + return await write_attributes_safe( + self._cluster, {"operation_preset": 4}, manufacturer=mfg_code ) diff --git a/zha/application/platforms/const.py b/zha/application/platforms/const.py new file mode 100644 index 000000000..6a60cec05 --- /dev/null +++ b/zha/application/platforms/const.py @@ -0,0 +1,18 @@ +"""Manufacturer-specific ZCL cluster IDs used across the platform layer.""" + +from typing import Final + +AQARA_OPPLE_CLUSTER: Final[int] = 0xFCC0 +IKEA_AIR_PURIFIER_CLUSTER: Final[int] = 0xFC7D +IKEA_REMOTE_CLUSTER: Final[int] = 0xFC80 +IKEA_SHORTCUT_V1_CLUSTER: Final[int] = 0xFC7F +INOVELLI_CLUSTER: Final[int] = 0xFC31 +OSRAM_CLUSTER: Final[int] = 0xFD00 +OSRAM_BUTTON_CLUSTER: Final[int] = 0xFD51 +PHILIPS_REMOTE_CLUSTER: Final[int] = 0xFC00 +SINOPE_MANUFACTURER_CLUSTER: Final[int] = 0xFF01 +SMARTTHINGS_ACCELERATION_CLUSTER: Final[int] = 0xFC02 +SMARTTHINGS_HUMIDITY_CLUSTER: Final[int] = 0xFC45 +SONOFF_CLUSTER: Final[int] = 0xFC11 +TUYA_MANUFACTURER_CLUSTER: Final[int] = 0xEF00 +VOC_LEVEL_CLUSTER: Final[int] = 0x042E diff --git a/zha/application/platforms/cover/__init__.py b/zha/application/platforms/cover/__init__.py index 259b3dd69..23f4ea09a 100644 --- a/zha/application/platforms/cover/__init__.py +++ b/zha/application/platforms/cover/__init__.py @@ -7,16 +7,28 @@ from collections import deque import functools import logging -from typing import TYPE_CHECKING, Any, cast +from typing import TYPE_CHECKING, Any from zigpy.profiles import zha -from zigpy.zcl.clusters.closures import WindowCovering -from zigpy.zcl.clusters.general import OnOff, OnOff as OnOffCluster +from zigpy.profiles.zha import PROFILE_ID as ZHA_PROFILE_ID +from zigpy.profiles.zll import PROFILE_ID as ZLL_PROFILE_ID +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, +) +from zigpy.zcl.clusters.closures import Shade as ShadeCluster, WindowCovering +from zigpy.zcl.clusters.general import LevelControl, OnOff, OnOff as OnOffCluster from zigpy.zcl.foundation import Status from zha.application import Platform +from zha.application.helpers import safe_read from zha.application.platforms import ( - ClusterHandlerMatch, + AttrConfig, + ClusterConfig, + ClusterMatch, PlatformEntity, PlatformFeatureGroup, register_entity, @@ -34,24 +46,8 @@ WCAttrs, ) from zha.exceptions import ZHAException -from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent -from zha.zigbee.cluster_handlers.closures import WindowCoveringClusterHandler -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_COVER, - CLUSTER_HANDLER_LEVEL, - CLUSTER_HANDLER_LEVEL_CHANGED, - CLUSTER_HANDLER_ON_OFF, - CLUSTER_HANDLER_SHADE, -) -from zha.zigbee.cluster_handlers.general import ( - LevelChangeEvent, - LevelControlClusterHandler, - OnOffClusterHandler, -) if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint @@ -132,45 +128,57 @@ class Cover(BaseCover): _attr_translation_key: str = "cover" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_COVER}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({WindowCovering.cluster_id}), ) + _server_cluster_config = { + WindowCovering.cluster_id: ClusterConfig( + bind=True, + attributes={ + WindowCovering.AttributeDefs.current_position_lift_percentage: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + WindowCovering.AttributeDefs.current_position_tilt_percentage: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + WindowCovering.AttributeDefs.window_covering_type: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs, ) -> None: """Init this cover.""" - legacy_discovery_unique_id = ( - f"{endpoint.device.ieee}-{endpoint.id}" - if ( - endpoint.zigpy_endpoint.device_type - == zha.DeviceType.LEVEL_CONTROLLABLE_OUTPUT - ) - else f"{endpoint.device.ieee}-{endpoint.id}-{int(WindowCovering.cluster_id)}" - ) - super().__init__( - cluster_handlers, - endpoint, - device, + endpoint=endpoint, + device=device, **kwargs, - legacy_discovery_unique_id=legacy_discovery_unique_id, - ) - cluster_handler = self.cluster_handlers.get(CLUSTER_HANDLER_COVER) - assert cluster_handler - - self._cover_cluster_handler: WindowCoveringClusterHandler = cast( - WindowCoveringClusterHandler, cluster_handler + legacy_discovery_unique_id=( + f"{endpoint.device.ieee}-{endpoint.id}" + if ( + endpoint.zigpy_endpoint.device_type + == zha.DeviceType.LEVEL_CONTROLLABLE_OUTPUT + ) + else f"{endpoint.device.ieee}-{endpoint.id}-{int(WindowCovering.cluster_id)}" + ), ) - if self._cover_cluster_handler.window_covering_type is not None: + self._cluster = endpoint.zigpy_endpoint.in_clusters[WindowCovering.cluster_id] + if self._window_covering_type is not None: self._attr_device_class: CoverDeviceClass | None = ( - ZCL_TO_COVER_DEVICE_CLASS.get( - self._cover_cluster_handler.window_covering_type - ) + ZCL_TO_COVER_DEVICE_CLASS.get(self._window_covering_type) ) self._attr_supported_features: CoverEntityFeature = CoverEntityFeature(0) self.recompute_capabilities() @@ -192,13 +200,18 @@ def __init__( self._state: CoverState | None = None self._determine_cover_state(refresh=True) + @property + def _window_covering_type(self) -> WindowCovering.WindowCoveringType | None: + """Return the window covering type.""" + return self._cluster.get(WCAttrs.window_covering_type.name) + def recompute_capabilities(self) -> None: """Recompute capabilities and feature flags based on the window covering type.""" super().recompute_capabilities() supported_features = CoverEntityFeature(0) # Enable lift features if the window covering type is not tilt only - if self._cover_cluster_handler.window_covering_type not in ( + if self._window_covering_type not in ( WCT.Shutter, WCT.Tilt_blind_tilt_only, ): @@ -210,7 +223,7 @@ def recompute_capabilities(self) -> None: ) # Enable tilt features if the window covering type supports tilt - if self._cover_cluster_handler.window_covering_type in ( + if self._window_covering_type in ( WCT.Shutter, WCT.Tilt_blind_tilt_only, WCT.Tilt_blind_tilt_and_lift, @@ -227,12 +240,17 @@ def recompute_capabilities(self) -> None: def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._cover_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) self._on_remove_callbacks.extend( (self._clear_lift_transition, self._clear_tilt_transition) ) @@ -305,12 +323,16 @@ def current_cover_position(self) -> int | None: In HA None is unknown, 0 is closed, 100 is fully open. In ZCL 0 is fully open, 100 is fully closed. - Keep in mind the values have already been flipped to match HA - in the WindowCovering cluster handler. """ if not self.supported_features & CoverEntityFeature.OPEN: return None - return self._cover_cluster_handler.current_position_lift_percentage + lift_percentage = self._cluster.get( + WCAttrs.current_position_lift_percentage.name + ) + if lift_percentage is None: + return None + # ZCL 0=open / 100=closed → HA 0=closed / 100=open + return 100 - lift_percentage @property def current_cover_tilt_position(self) -> int | None: @@ -318,12 +340,15 @@ def current_cover_tilt_position(self) -> int | None: In HA None is unknown, 0 is closed, 100 is fully open. In ZCL 0 is fully open, 100 is fully closed. - Keep in mind the values have already been flipped to match HA - in the WindowCovering cluster handler. """ if not self.supported_features & CoverEntityFeature.OPEN_TILT: return None - return self._cover_cluster_handler.current_position_tilt_percentage + tilt_percentage = self._cluster.get( + WCAttrs.current_position_tilt_percentage.name + ) + if tilt_percentage is None: + return None + return 100 - tilt_percentage @property def _previous_cover_position(self) -> int | None: @@ -550,14 +575,18 @@ def _clear_tilt_transition(self, determine_state: bool = False) -> None: return self._determine_cover_state(refresh=True) - def handle_cluster_handler_attribute_updated( - self, event: ClusterAttributeUpdatedEvent + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: - """Handle position updates from cluster handler. + """Handle position updates from the WindowCovering cluster. The previous position is retained for use in state determination. """ - _LOGGER.debug("handle_cluster_handler_attribute_updated=%s", event) + _LOGGER.debug("handle_attribute_updated=%s", event) if event.attribute_id == WCAttrs.current_position_lift_percentage.id: self._lift_position_history.append(self.current_cover_position) self._determine_cover_state(is_lift_update=True) @@ -576,10 +605,24 @@ def async_update_state(self, state): self._tilt_state = None self.maybe_emit_state_changed_event() + async def async_update(self) -> None: + """Retrieve latest state.""" + self.debug("polling current state") + await safe_read( + self._cluster, + [ + WCAttrs.current_position_lift_percentage.name, + WCAttrs.current_position_tilt_percentage.name, + ], + allow_cache=False, + only_cache=False, + ) + self.maybe_emit_state_changed_event() + async def async_open_cover(self) -> None: """Open the cover.""" self._set_lift_transition_target(POSITION_OPEN) - res = await self._cover_cluster_handler.up_open() + res = await self._cluster.up_open() if res[1] is not Status.SUCCESS: self._clear_lift_transition() raise ZHAException(f"Failed to open cover: {res[1]}") @@ -591,7 +634,7 @@ async def async_open_cover(self) -> None: async def async_open_cover_tilt(self) -> None: """Open the cover tilt.""" self._set_tilt_transition_target(POSITION_OPEN) - res = await self._cover_cluster_handler.go_to_tilt_percentage( + res = await self._cluster.go_to_tilt_percentage( self._ha_position_to_zcl(POSITION_OPEN) ) if res[1] is not Status.SUCCESS: @@ -605,7 +648,7 @@ async def async_open_cover_tilt(self) -> None: async def async_close_cover(self) -> None: """Close the cover.""" self._set_lift_transition_target(POSITION_CLOSED) - res = await self._cover_cluster_handler.down_close() + res = await self._cluster.down_close() if res[1] is not Status.SUCCESS: self._clear_lift_transition() raise ZHAException(f"Failed to close cover: {res[1]}") @@ -617,7 +660,7 @@ async def async_close_cover(self) -> None: async def async_close_cover_tilt(self) -> None: """Close the cover tilt.""" self._set_tilt_transition_target(POSITION_CLOSED) - res = await self._cover_cluster_handler.go_to_tilt_percentage( + res = await self._cluster.go_to_tilt_percentage( self._ha_position_to_zcl(POSITION_CLOSED) ) if res[1] is not Status.SUCCESS: @@ -634,7 +677,7 @@ async def async_set_cover_position(self, position: int) -> None: target_position = position self._set_lift_transition_target(target_position) - res = await self._cover_cluster_handler.go_to_lift_percentage( + res = await self._cluster.go_to_lift_percentage( self._ha_position_to_zcl(target_position) ) if res[1] is not Status.SUCCESS: @@ -655,7 +698,7 @@ async def async_set_cover_tilt_position(self, tilt_position: int) -> None: target_position = tilt_position self._set_tilt_transition_target(target_position) - res = await self._cover_cluster_handler.go_to_tilt_percentage( + res = await self._cluster.go_to_tilt_percentage( self._ha_position_to_zcl(target_position) ) if res[1] is not Status.SUCCESS: @@ -675,7 +718,7 @@ async def async_stop_cover(self) -> None: Upon receipt of this command the cover stops both lift and tilt movement. """ - res = await self._cover_cluster_handler.stop() + res = await self._cluster.stop() if res[1] is not Status.SUCCESS: raise ZHAException(f"Failed to stop cover: {res[1]}") self._clear_lift_transition() @@ -706,10 +749,11 @@ class Shade(BaseCover): _attr_device_class = CoverDeviceClass.SHADE _attr_translation_key: str = "shade" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), - optional_cluster_handlers=frozenset( - {CLUSTER_HANDLER_LEVEL, CLUSTER_HANDLER_SHADE} + _cluster_match = ClusterMatch( + profile_ids=frozenset({ZHA_PROFILE_ID, ZLL_PROFILE_ID, 512}), + server_clusters=frozenset({OnOff.cluster_id}), + optional_server_clusters=frozenset( + {LevelControl.cluster_id, ShadeCluster.cluster_id} ), profile_device_types=frozenset( { @@ -720,34 +764,79 @@ class Shade(BaseCover): feature_priority=(PlatformFeatureGroup.LIGHT_OR_SWITCH_OR_SHADE, 0), ) + _server_cluster_config = { + OnOff.cluster_id: ClusterConfig( + bind=True, + attributes={ + OnOff.AttributeDefs.on_off: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + OnOff.AttributeDefs.start_up_on_off: AttrConfig( + read_on_startup=False, + ), + }, + ), + LevelControl.cluster_id: ClusterConfig( + bind=True, + attributes={ + LevelControl.AttributeDefs.current_level: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=1, max_interval=900, reportable_change=1 + ), + ), + LevelControl.AttributeDefs.on_off_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.on_level: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.on_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.off_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.default_move_rate: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.start_up_current_level: AttrConfig( + read_on_startup=False, + ), + }, + ), + ShadeCluster.cluster_id: ClusterConfig(bind=True), + } + def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs, ) -> None: """Initialize the ZHA shade.""" super().__init__( - cluster_handlers, - endpoint, - device, + endpoint=endpoint, + device=device, **kwargs, legacy_discovery_unique_id=f"{endpoint.device.ieee}-{endpoint.id}", ) - self._on_off_cluster_handler: OnOffClusterHandler = cast( - OnOffClusterHandler, self.cluster_handlers[CLUSTER_HANDLER_ON_OFF] - ) - self._level_cluster_handler: LevelControlClusterHandler | None = cast( - LevelControlClusterHandler, self.cluster_handlers.get(CLUSTER_HANDLER_LEVEL) + self._on_off_cluster = endpoint.zigpy_endpoint.in_clusters[OnOff.cluster_id] + self._level_cluster = endpoint.zigpy_endpoint.in_clusters.get( + LevelControl.cluster_id ) - self._is_open: bool | None = self._on_off_cluster_handler.on_off + self._is_open: bool | None = self._on_off_cluster.get( + OnOff.AttributeDefs.on_off.name + ) self._position: int | None = None - if self._level_cluster_handler is not None: + if self._level_cluster is not None: self._position = self._zcl_level_to_ha_position( - self._level_cluster_handler.current_level + self._level_cluster.get(LevelControl.AttributeDefs.current_level.name) ) self.recompute_capabilities() @@ -758,25 +847,36 @@ def recompute_capabilities(self) -> None: CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE ) - if self._level_cluster_handler is not None: + if self._level_cluster is not None: self._attr_supported_features |= ( CoverEntityFeature.STOP | CoverEntityFeature.SET_POSITION ) def on_add(self) -> None: """Run when entity is added.""" - self._on_remove_callbacks.append( - self._on_off_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, - ) - ) - if self._level_cluster_handler is not None: + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): self._on_remove_callbacks.append( - self._level_cluster_handler.on_event( - CLUSTER_HANDLER_LEVEL_CHANGED, self.handle_cluster_handler_set_level + self._on_off_cluster.on_event( + event_type.event_type, self.handle_attribute_updated ) ) + if self._level_cluster is not None: + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._level_cluster.on_event( + event_type.event_type, self.handle_level_attribute_updated + ) + ) @property def state(self) -> dict[str, Any]: @@ -823,22 +923,33 @@ def is_closed(self) -> bool | None: """Return True if shade is closed.""" return None if self._is_open is None else not self._is_open - def handle_cluster_handler_attribute_updated( - self, event: ClusterAttributeUpdatedEvent + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: """Set open/closed state.""" if event.attribute_id == OnOff.AttributeDefs.on_off.id: - self._is_open = event.attribute_value + self._is_open = event.value self.maybe_emit_state_changed_event() - def handle_cluster_handler_set_level(self, event: LevelChangeEvent) -> None: + def handle_level_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, + ) -> None: """Set the reported position.""" - self._position = self._zcl_level_to_ha_position(event.level) - self.maybe_emit_state_changed_event() + if event.attribute_id == LevelControl.AttributeDefs.current_level.id: + self._position = self._zcl_level_to_ha_position(event.value) + self.maybe_emit_state_changed_event() async def async_open_cover(self) -> None: """Open the window cover.""" - res = await self._on_off_cluster_handler.on() + res = await self._on_off_cluster.on() if res[1] != Status.SUCCESS: raise ZHAException(f"Failed to open cover: {res[1]}") @@ -847,7 +958,7 @@ async def async_open_cover(self) -> None: async def async_close_cover(self) -> None: """Close the window cover.""" - res = await self._on_off_cluster_handler.off() + res = await self._on_off_cluster.off() if res[1] != Status.SUCCESS: raise ZHAException(f"Failed to close cover: {res[1]}") @@ -856,11 +967,11 @@ async def async_close_cover(self) -> None: async def async_set_cover_position(self, position: int) -> None: """Move the roller shutter to a specific position.""" - if not self._level_cluster_handler: + if not self._level_cluster: return new_pos = position - res = await self._level_cluster_handler.move_to_level_with_on_off( + res = await self._level_cluster.move_to_level_with_on_off( self._ha_position_to_zcl_level(new_pos), 1 ) @@ -872,10 +983,10 @@ async def async_set_cover_position(self, position: int) -> None: async def async_stop_cover(self) -> None: """Stop the cover.""" - if not self._level_cluster_handler: + if not self._level_cluster: return - res = await self._level_cluster_handler.stop() + res = await self._level_cluster.stop() if res[1] != Status.SUCCESS: raise ZHAException(f"Failed to stop cover: {res[1]}") @@ -900,22 +1011,22 @@ class KeenVent(Shade): _attr_device_class = CoverDeviceClass.DAMPER _attr_translation_key: str = "keen_vent" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_LEVEL, CLUSTER_HANDLER_ON_OFF}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({LevelControl.cluster_id, OnOff.cluster_id}), manufacturers=frozenset({"Keen Home Inc"}), feature_priority=(PlatformFeatureGroup.LIGHT_OR_SWITCH_OR_SHADE, 1), ) async def async_open_cover(self) -> None: """Open the cover.""" - assert self._level_cluster_handler is not None + assert self._level_cluster is not None position = self._position or 100 await asyncio.gather( - self._level_cluster_handler.move_to_level_with_on_off( + self._level_cluster.move_to_level_with_on_off( self._ha_position_to_zcl_level(position), 1 ), - self._on_off_cluster_handler.on(), + self._on_off_cluster.on(), ) self._is_open = True diff --git a/zha/application/platforms/device_tracker.py b/zha/application/platforms/device_tracker.py index 0014f811c..0328195e0 100644 --- a/zha/application/platforms/device_tracker.py +++ b/zha/application/platforms/device_tracker.py @@ -6,28 +6,30 @@ from enum import StrEnum import functools import time -from typing import TYPE_CHECKING, Any, cast +from typing import TYPE_CHECKING, Any from zigpy.profiles import zha +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, +) from zigpy.zcl.clusters.general import PowerConfiguration from zha.application import Platform from zha.application.platforms import ( - ClusterHandlerMatch, + AttrConfig, + ClusterConfig, + ClusterMatch, PlatformEntity, register_entity, ) from zha.application.platforms.sensor import Battery from zha.decorators import periodic -from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_POWER_CONFIGURATION, -) -from zha.zigbee.cluster_handlers.general import PowerConfigurationClusterHandler if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint @@ -87,32 +89,55 @@ class DeviceScannerEntity(BaseDeviceTracker): _attr_fallback_name: str = "Device scanner" __polling_interval: int - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_POWER_CONFIGURATION}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({PowerConfiguration.cluster_id}), profile_device_types=frozenset( {(zha.PROFILE_ID, SMARTTHINGS_ARRIVAL_SENSOR_DEVICE_TYPE)} ), ) + _server_cluster_config = { + PowerConfiguration.cluster_id: ClusterConfig( + bind=True, + attributes={ + PowerConfiguration.AttributeDefs.battery_voltage: AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=3600, max_interval=10800, reportable_change=1 + ), + ), + PowerConfiguration.AttributeDefs.battery_percentage_remaining: AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=3600, max_interval=10800, reportable_change=1 + ), + ), + PowerConfiguration.AttributeDefs.battery_size: AttrConfig( + read_on_startup=True, + ), + PowerConfiguration.AttributeDefs.battery_quantity: AttrConfig( + read_on_startup=True, + ), + }, + ), + } + def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs, ): """Initialize the ZHA device tracker.""" super().__init__( - cluster_handlers, - endpoint, - device, - **kwargs, + endpoint=endpoint, + device=device, legacy_discovery_unique_id=f"{endpoint.device.ieee}-{endpoint.id}", + **kwargs, ) - self._battery_cluster_handler: PowerConfigurationClusterHandler = cast( - PowerConfigurationClusterHandler, - self.cluster_handlers[CLUSTER_HANDLER_POWER_CONFIGURATION], - ) + self._cluster = endpoint.zigpy_endpoint.in_clusters[ + PowerConfiguration.cluster_id + ] self._connected: bool = False self._keepalive_interval: int = 60 self._should_poll: bool = True @@ -121,12 +146,17 @@ def __init__( def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._battery_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) self._tracked_tasks.append( self.device.gateway.async_create_background_task( @@ -176,8 +206,12 @@ async def async_update(self) -> None: self._connected = True self.maybe_emit_state_changed_event() - def handle_cluster_handler_attribute_updated( - self, event: ClusterAttributeUpdatedEvent + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: """Handle tracking.""" if ( @@ -185,7 +219,7 @@ def handle_cluster_handler_attribute_updated( != PowerConfiguration.AttributeDefs.battery_percentage_remaining.name ): return - self.debug("battery_percentage_remaining updated: %s", event.attribute_value) + self.debug("battery_percentage_remaining updated: %s", event.value) self._connected = True - self._battery_level = Battery.formatter(event.attribute_value) + self._battery_level = Battery.formatter(event.value) self.maybe_emit_state_changed_event() diff --git a/zha/application/platforms/fan/__init__.py b/zha/application/platforms/fan/__init__.py index d3f756a29..5f60e4663 100644 --- a/zha/application/platforms/fan/__init__.py +++ b/zha/application/platforms/fan/__init__.py @@ -6,21 +6,32 @@ from dataclasses import dataclass import functools import math -from typing import TYPE_CHECKING, Any, cast - +from typing import TYPE_CHECKING, Any + +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, +) from zigpy.zcl.clusters import hvac from zha.application import Platform +from zha.application.helpers import safe_read, write_attributes_safe from zha.application.platforms import ( + AttrConfig, BaseEntity, BaseEntityInfo, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, GroupEntity, PlatformEntity, PlatformFeatureGroup, register_entity, register_group_entity, ) +from zha.application.platforms.const import IKEA_AIR_PURIFIER_CLUSTER from zha.application.platforms.fan.const import ( ATTR_PERCENTAGE, ATTR_PRESET_MODE, @@ -42,23 +53,9 @@ percentage_to_ranged_value, ranged_value_to_percentage, ) -from zha.zigbee.cluster_handlers import ( - ClusterAttributeUpdatedEvent, - wrap_zigpy_exceptions, -) -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_FAN, - IKEA_AIR_PURIFIER_CLUSTER, -) -from zha.zigbee.cluster_handlers.hvac import FanClusterHandler -from zha.zigbee.cluster_handlers.manufacturerspecific import ( - IkeaAirPurifierClusterHandler, -) from zha.zigbee.group import Group if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint @@ -223,11 +220,14 @@ async def async_set_preset_mode(self, preset_mode: str) -> None: async def _async_set_fan_mode(self, fan_mode: int) -> None: """Set the fan mode for the fan.""" - def handle_cluster_handler_attribute_updated( + def handle_attribute_updated( self, - event: ClusterAttributeUpdatedEvent, # pylint: disable=unused-argument + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: - """Handle state update from cluster handler.""" + """Handle state update from cluster.""" self.maybe_emit_state_changed_event() def speed_to_percentage(self, speed: str) -> int: @@ -249,58 +249,90 @@ def percentage_to_speed(self, percentage: int) -> str: class Fan(BaseFan, PlatformEntity): """Representation of a ZHA fan.""" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_FAN}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({hvac.Fan.cluster_id}), # We prefer Thermostat entities if possible feature_priority=(PlatformFeatureGroup.THERMOSTAT_FAN, -1), ) + _server_cluster_config = { + hvac.Fan.cluster_id: ClusterConfig( + bind=True, + attributes={ + hvac.Fan.AttributeDefs.fan_mode: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + hvac.Fan.AttributeDefs.fan_mode_sequence: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs, ) -> None: """Initialize the fan.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) - self._fan_cluster_handler: FanClusterHandler = cast( - FanClusterHandler, self.cluster_handlers[CLUSTER_HANDLER_FAN] - ) + super().__init__(endpoint=endpoint, device=device, **kwargs) self.recompute_capabilities() def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._fan_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) + + @property + def _fan_mode(self) -> int | None: + """Return current fan mode.""" + return self._cluster.get(hvac.Fan.AttributeDefs.fan_mode.name) @property def percentage(self) -> int | None: """Return the current speed percentage.""" - if ( - self._fan_cluster_handler.fan_mode is None - or self._fan_cluster_handler.fan_mode > self.speed_range[1] - ): + fan_mode = self._fan_mode + if fan_mode is None or fan_mode > self.speed_range[1]: return None - if self._fan_cluster_handler.fan_mode == 0: + if fan_mode == 0: return 0 - return ranged_value_to_percentage( - self.speed_range, self._fan_cluster_handler.fan_mode - ) + return ranged_value_to_percentage(self.speed_range, fan_mode) @property def preset_mode(self) -> str | None: """Return the current preset mode.""" - return self.preset_modes_to_name.get(self._fan_cluster_handler.fan_mode) + return self.preset_modes_to_name.get(self._fan_mode) async def _async_set_fan_mode(self, fan_mode: int) -> None: """Set the fan mode for the fan.""" - await self._fan_cluster_handler.async_set_speed(fan_mode) + await write_attributes_safe( + self._cluster, {hvac.Fan.AttributeDefs.fan_mode.name: fan_mode} + ) + self.maybe_emit_state_changed_event() + + async def async_update(self) -> None: + """Retrieve latest state.""" + self.debug("polling current state") + await safe_read( + self._cluster, + [hvac.Fan.AttributeDefs.fan_mode.name], + allow_cache=False, + only_cache=False, + ) self.maybe_emit_state_changed_event() @@ -310,9 +342,7 @@ class FanGroup(BaseFan, GroupEntity): def __init__(self, group: Group): """Initialize a fan group.""" - self._fan_cluster_handler: FanClusterHandler = cast( - FanClusterHandler, group.endpoint[hvac.Fan.cluster_id] - ) + self._cluster = group.endpoint[hvac.Fan.cluster_id] super().__init__(group) self._percentage = None self._preset_mode = None @@ -332,10 +362,7 @@ def preset_mode(self) -> str | None: async def _async_set_fan_mode(self, fan_mode: int) -> None: """Set the fan mode for the group.""" - - with wrap_zigpy_exceptions(): - await self._fan_cluster_handler.write_attributes({"fan_mode": fan_mode}) - + await write_attributes_safe(self._cluster, {"fan_mode": fan_mode}) self.maybe_emit_state_changed_event() def update(self, _: Any = None) -> None: @@ -378,38 +405,104 @@ class IkeaFan(BaseFan, PlatformEntity): | FanEntityFeature.TURN_ON ) - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"ikea_airpurifier"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({IKEA_AIR_PURIFIER_CLUSTER}), models=frozenset({"STARKVIND Air purifier", "STARKVIND Air purifier table"}), ) - def __init__( - self, - cluster_handlers: list[ClusterHandler], - endpoint: Endpoint, - device: Device, - **kwargs, - ): - """Initialize the fan.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) - self._fan_cluster_handler: IkeaAirPurifierClusterHandler = cast( - IkeaAirPurifierClusterHandler, self.cluster_handlers["ikea_airpurifier"] - ) + # Aggregated reporting/bind config for the whole STARKVIND manufacturer + # cluster; sibling ChildLock/DisableLed switches don't need their own. + _server_cluster_config = { + IKEA_AIR_PURIFIER_CLUSTER: ClusterConfig( + bind=True, + attributes={ + "filter_run_time": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + "replace_filter": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + "filter_life_time": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + "disable_led": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + "air_quality_25pm": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + "child_lock": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + "fan_mode": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + "fan_speed": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + "device_run_time": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._fan_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) + + @property + def _fan_mode(self) -> int | None: + """Return current fan mode.""" + return self._cluster.get("fan_mode") + + @property + def _fan_speed(self) -> int | None: + """Return current fan speed.""" + return self._cluster.get("fan_speed") @property def preset_mode(self) -> str | None: """Return the current preset mode.""" - return self.preset_modes_to_name.get(self._fan_cluster_handler.fan_mode) + return self.preset_modes_to_name.get(self._fan_mode) @functools.cached_property def preset_modes_to_name(self) -> dict[int, str]: @@ -426,15 +519,16 @@ def speed_range(self) -> tuple[int, int]: @property def percentage(self) -> int | None: """Return the current speed percentage.""" - if self._fan_cluster_handler.fan_speed is None: + fan_speed = self._fan_speed + if fan_speed is None: return None - if self._fan_cluster_handler.fan_speed == 0: + if fan_speed == 0: return 0 return ranged_value_to_percentage( # Starkvind has an additional fan_speed attribute that we can use to # get the speed even if fan_mode is set to auto. self.speed_range, - self._fan_cluster_handler.fan_speed, + fan_speed, ) async def async_turn_on( @@ -452,7 +546,7 @@ async def async_turn_on( async def _async_set_fan_mode(self, fan_mode: int) -> None: """Set the fan mode for the fan.""" - await self._fan_cluster_handler.async_set_speed(fan_mode) + await write_attributes_safe(self._cluster, {"fan_mode": fan_mode}) self.maybe_emit_state_changed_event() async def async_set_percentage(self, percentage: int) -> None: @@ -463,6 +557,17 @@ async def async_set_percentage(self, percentage: int) -> None: fan_mode = 2 await self._async_set_fan_mode(fan_mode) + async def async_update(self) -> None: + """Retrieve latest state.""" + self.debug("polling current state") + await safe_read( + self._cluster, + ["fan_mode", "fan_speed"], + allow_cache=False, + only_cache=False, + ) + self.maybe_emit_state_changed_event() + @register_entity(hvac.Fan.cluster_id) class KofFan(Fan): @@ -475,8 +580,8 @@ class KofFan(Fan): | FanEntityFeature.TURN_ON ) - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_FAN}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({hvac.Fan.cluster_id}), models=frozenset({"HBUniversalCFRemote", "HDC52EastwindFan"}), feature_priority=(PlatformFeatureGroup.THERMOSTAT_FAN, 1), ) diff --git a/zha/application/platforms/light/__init__.py b/zha/application/platforms/light/__init__.py index aa41c148c..2c17d0888 100644 --- a/zha/application/platforms/light/__init__.py +++ b/zha/application/platforms/light/__init__.py @@ -13,18 +13,28 @@ import functools import itertools import logging -from typing import TYPE_CHECKING, Any, cast - +from typing import TYPE_CHECKING, Any + +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, +) from zigpy.zcl.clusters.general import Identify, LevelControl, OnOff from zigpy.zcl.clusters.lighting import Color from zigpy.zcl.foundation import Status from zha.application import Platform +from zha.application.helpers import safe_read from zha.application.platforms import ( DEFAULT_UPDATE_GROUP_FROM_CHILD_DELAY, + AttrConfig, BaseEntity, BaseEntityInfo, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, GroupEntity, PlatformEntity, PlatformFeatureGroup, @@ -68,25 +78,9 @@ ) from zha.debounce import Debouncer from zha.decorators import periodic -from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_COLOR, - CLUSTER_HANDLER_LEVEL, - CLUSTER_HANDLER_LEVEL_CHANGED, - CLUSTER_HANDLER_ON_OFF, -) -from zha.zigbee.cluster_handlers.general import ( - IdentifyClusterHandler, - LevelChangeEvent, - LevelControlClusterHandler, - OnOffClusterHandler, -) -from zha.zigbee.cluster_handlers.lighting import ColorClusterHandler if TYPE_CHECKING: from zha.application.gateway import Gateway - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint from zha.zigbee.group import Group @@ -265,7 +259,7 @@ def restore_external_state_attributes( self._effect = effect -class BaseClusterHandlerLight(BaseLight): +class BaseSharedLight(BaseLight): """Operations common to all light entities.""" _FORCE_ON = False @@ -277,10 +271,10 @@ def __init__(self, *args, **kwargs): self._zha_config_transition: float = self._DEFAULT_MIN_TRANSITION_TIME self._zha_config_enhanced_light_transition: bool = False self._zha_config_enable_light_transitioning_flag: bool = True - self._on_off_cluster_handler: OnOffClusterHandler | None = None - self._level_cluster_handler: LevelControlClusterHandler | None = None - self._color_cluster_handler: ColorClusterHandler | None = None - self._identify_cluster_handler: IdentifyClusterHandler | None = None + self._on_off_cluster = None + self._level_cluster = None + self._color_cluster = None + self._identify_cluster = None self._transitioning_individual: bool = False self._transitioning_group: bool = False self._transition_listener: asyncio.TimerHandle | None = None @@ -288,6 +282,75 @@ def __init__(self, *args, **kwargs): self._internal_supported_color_modes: set[ColorMode] = set() + @property + def _color_capabilities(self) -> Color.ColorCapabilities: + """Return ZCL color capabilities of the light.""" + if self._color_cluster is None: + return Color.ColorCapabilities.XY_attributes + color_capabilities = self._color_cluster.get( + Color.AttributeDefs.color_capabilities.name + ) + if color_capabilities is None: + return Color.ColorCapabilities.XY_attributes + return Color.ColorCapabilities(color_capabilities) + + @property + def _color_temperature(self) -> int | None: + if self._color_cluster is None: + return None + return self._color_cluster.get(Color.AttributeDefs.color_temperature.name) + + @property + def _color_xy_supported(self) -> bool: + return Color.ColorCapabilities.XY_attributes in self._color_capabilities + + @property + def _color_temp_supported(self) -> bool: + return ( + Color.ColorCapabilities.Color_temperature in self._color_capabilities + ) or self._color_temperature is not None + + @property + def _color_loop_supported(self) -> bool: + return Color.ColorCapabilities.Color_loop in self._color_capabilities + + @property + def _color_options(self) -> Color.Options: + if self._color_cluster is None: + return Color.Options(0) + return Color.Options( + self._color_cluster.get(Color.AttributeDefs.options.name, 0) + ) + + @property + def _execute_if_off_supported(self) -> bool: + return Color.Options.Execute_if_off in self._color_options + + _COLOR_MIN_MIREDS = 153 + _COLOR_MAX_MIREDS = 500 + + @property + def _color_min_mireds(self) -> int: + if self._color_cluster is None: + return self._COLOR_MIN_MIREDS + min_mireds = self._color_cluster.get( + Color.AttributeDefs.color_temp_physical_min.name, self._COLOR_MIN_MIREDS + ) + if min_mireds == 0: + min_mireds = self._COLOR_MIN_MIREDS + return min_mireds + + @property + def _color_max_mireds(self) -> int: + if self._color_cluster is None: + return self._COLOR_MAX_MIREDS + max_mireds = self._color_cluster.get( + Color.AttributeDefs.color_temp_physical_max.name, self._COLOR_MAX_MIREDS + ) + if max_mireds == 0: + max_mireds = self._COLOR_MAX_MIREDS + return max_mireds + @property @abstractmethod def _gateway(self) -> Gateway: @@ -334,15 +397,14 @@ async def async_turn_on( execute_if_off_supported = ( self._GROUP_SUPPORTS_EXECUTE_IF_OFF if isinstance(self, LightGroup) - else self._color_cluster_handler - and self._color_cluster_handler.execute_if_off_supported + else (self._color_cluster is not None and self._execute_if_off_supported) ) # A device theoretically could lie about having brightness support and omit the # actual LevelControl cluster needed to control it brightness_supported = ( is_brightness_supported(self._internal_supported_color_modes) - and self._level_cluster_handler is not None + and self._level_cluster is not None ) set_transition_flag = ( @@ -457,12 +519,12 @@ async def _async_turn_on_impl( # noqa: C901 t_log = {} if new_color_provided_while_off: - assert self._level_cluster_handler is not None + assert self._level_cluster is not None # If the light is currently off, we first need to turn it on at a low # brightness level with no transition. # After that, we set it to the desired color/temperature with no transition. - result = await self._level_cluster_handler.move_to_level_with_on_off( + result = await self._level_cluster.move_to_level_with_on_off( level=DEFAULT_MIN_BRIGHTNESS, transition_time=int(10 * self._DEFAULT_MIN_TRANSITION_TIME), ) @@ -501,9 +563,9 @@ async def _async_turn_on_impl( # noqa: C901 and not new_color_provided_while_off and brightness_supported ): - assert self._level_cluster_handler is not None + assert self._level_cluster is not None - result = await self._level_cluster_handler.move_to_level_with_on_off( + result = await self._level_cluster.move_to_level_with_on_off( level=level, transition_time=int(10 * duration), ) @@ -524,12 +586,12 @@ async def _async_turn_on_impl( # noqa: C901 and not new_color_provided_while_off or (self._FORCE_ON and brightness != 0) ): - assert self._on_off_cluster_handler is not None + assert self._on_off_cluster is not None # since FORCE_ON lights don't turn on with move_to_level_with_on_off, # we should call the on command on the on_off cluster # if brightness is not 0. - result = await self._on_off_cluster_handler.on() + result = await self._on_off_cluster.on() t_log["on_off"] = result if result[1] is not Status.SUCCESS: # 'On' call failed, but as brightness may still transition @@ -556,11 +618,11 @@ async def _async_turn_on_impl( # noqa: C901 return if new_color_provided_while_off: - assert self._level_cluster_handler is not None + assert self._level_cluster is not None # The light has the correct color, so we can now transition # it to the correct brightness level. - result = await self._level_cluster_handler.move_to_level( + result = await self._level_cluster.move_to_level( level=level, transition_time=int(10 * duration) ) t_log["move_to_level_if_color"] = result @@ -581,9 +643,9 @@ async def _async_turn_on_impl( # noqa: C901 # attribute reports after the completed transition). self.async_transition_start_timer(transition_time) - if self._color_cluster_handler is not None: + if self._color_cluster is not None: if effect == EFFECT_COLORLOOP: - result = await self._color_cluster_handler.color_loop_set( + result = await self._color_cluster.color_loop_set( update_flags=( Color.ColorLoopUpdateFlags.Action | Color.ColorLoopUpdateFlags.Direction @@ -597,7 +659,7 @@ async def _async_turn_on_impl( # noqa: C901 t_log["color_loop_set"] = result self._effect = EFFECT_COLORLOOP elif self._effect == EFFECT_COLORLOOP and effect != EFFECT_COLORLOOP: - result = await self._color_cluster_handler.color_loop_set( + result = await self._color_cluster.color_loop_set( update_flags=Color.ColorLoopUpdateFlags.Action, action=Color.ColorLoopAction.Deactivate, direction=Color.ColorLoopDirection.Decrement, @@ -608,8 +670,8 @@ async def _async_turn_on_impl( # noqa: C901 self._effect = EFFECT_OFF if flash is not None: - assert self._identify_cluster_handler is not None - result = await self._identify_cluster_handler.trigger_effect( + assert self._identify_cluster is not None + result = await self._identify_cluster.trigger_effect( effect_id=FLASH_EFFECTS[flash], effect_variant=Identify.EffectVariant.Default, ) @@ -624,7 +686,7 @@ async def async_turn_off(self, *, transition: float | None = None) -> None: """Turn the entity off.""" brightness_supported = ( is_brightness_supported(self._internal_supported_color_modes) - and self._level_cluster_handler is not None + and self._level_cluster is not None ) transition_time = ( @@ -641,17 +703,17 @@ async def async_turn_off(self, *, transition: float | None = None) -> None: # is not none looks odd here, but it will override built in bulb # transition times if we pass 0 in here if transition is not None and brightness_supported: - assert self._level_cluster_handler is not None + assert self._level_cluster is not None - result = await self._level_cluster_handler.move_to_level_with_on_off( + result = await self._level_cluster.move_to_level_with_on_off( level=0, transition_time=int( 10 * (transition or self._DEFAULT_MIN_TRANSITION_TIME) ), ) else: - assert self._on_off_cluster_handler is not None - result = await self._on_off_cluster_handler.off() + assert self._on_off_cluster is not None + result = await self._on_off_cluster.off() # Pause parsing attribute reports until transition is complete if self._zha_config_enable_light_transitioning_flag: @@ -696,9 +758,9 @@ async def async_handle_color_commands( ) if color_temp is not None: - assert self._color_cluster_handler is not None + assert self._color_cluster is not None - result = await self._color_cluster_handler.move_to_color_temp( + result = await self._color_cluster.move_to_color_temp( color_temp_mireds=color_temp, transition_time=int(10 * transition_time), ) @@ -710,9 +772,9 @@ async def async_handle_color_commands( self._xy_color = None if xy_color is not None: - assert self._color_cluster_handler is not None + assert self._color_cluster is not None - result = await self._color_cluster_handler.move_to_color( + result = await self._color_cluster.move_to_color( color_x=int(xy_color[0] * 65535), color_y=int(xy_color[1] * 65535), transition_time=int(10 * transition_time), @@ -815,51 +877,132 @@ async def on_remove(self) -> None: @register_entity(OnOff.cluster_id) -class Light(BaseClusterHandlerLight, PlatformEntity): +class Light(BaseSharedLight, PlatformEntity): """Representation of a ZHA or ZLL light.""" _attr_translation_key: str = "light" _REFRESH_INTERVAL = (2700, 4500) __polling_interval: int - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), - optional_cluster_handlers=frozenset( - {CLUSTER_HANDLER_COLOR, CLUSTER_HANDLER_LEVEL} - ), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OnOff.cluster_id}), + optional_server_clusters=frozenset({Color.cluster_id, LevelControl.cluster_id}), profile_device_types=LIGHT_PROFILE_DEVICE_TYPES, feature_priority=(PlatformFeatureGroup.LIGHT_OR_SWITCH_OR_SHADE, 0), ) + _server_cluster_config = { + OnOff.cluster_id: ClusterConfig( + bind=True, + attributes={ + OnOff.AttributeDefs.on_off: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + OnOff.AttributeDefs.start_up_on_off: AttrConfig( + read_on_startup=False, + ), + }, + ), + LevelControl.cluster_id: ClusterConfig( + bind=True, + attributes={ + LevelControl.AttributeDefs.current_level: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=1, max_interval=900, reportable_change=1 + ), + ), + LevelControl.AttributeDefs.on_off_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.on_level: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.on_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.off_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.default_move_rate: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.start_up_current_level: AttrConfig( + read_on_startup=False, + ), + }, + ), + Color.cluster_id: ClusterConfig( + bind=True, + attributes={ + Color.AttributeDefs.current_x: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Color.AttributeDefs.current_y: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Color.AttributeDefs.color_temperature: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Color.AttributeDefs.color_mode: AttrConfig( + read_on_startup=True, + ), + Color.AttributeDefs.color_temp_physical_min: AttrConfig( + read_on_startup=False, + ), + Color.AttributeDefs.color_temp_physical_max: AttrConfig( + read_on_startup=False, + ), + Color.AttributeDefs.color_capabilities: AttrConfig( + read_on_startup=False, + ), + Color.AttributeDefs.color_loop_active: AttrConfig( + read_on_startup=True, + ), + Color.AttributeDefs.start_up_color_temperature: AttrConfig( + read_on_startup=False, + ), + Color.AttributeDefs.options: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs, ) -> None: """Initialize the light.""" super().__init__( - cluster_handlers, - endpoint, - device, + endpoint=endpoint, + device=device, **kwargs, legacy_discovery_unique_id=f"{endpoint.device.ieee}-{endpoint.id}", ) - self._on_off_cluster_handler: OnOffClusterHandler = cast( - OnOffClusterHandler, self.cluster_handlers[CLUSTER_HANDLER_ON_OFF] + self._on_off_cluster = endpoint.zigpy_endpoint.in_clusters[OnOff.cluster_id] + self._state: bool = bool( + self._on_off_cluster.get(OnOff.AttributeDefs.on_off.name) ) - self._state: bool = bool(self._on_off_cluster_handler.on_off) - self._level_cluster_handler: LevelControlClusterHandler | None = cast( - LevelControlClusterHandler | None, - self.cluster_handlers.get(CLUSTER_HANDLER_LEVEL), - ) - self._color_cluster_handler: ColorClusterHandler | None = cast( - ColorClusterHandler | None, self.cluster_handlers.get(CLUSTER_HANDLER_COLOR) - ) - self._identify_cluster_handler: IdentifyClusterHandler | None = cast( - IdentifyClusterHandler | None, device.identify_ch + self._level_cluster = endpoint.zigpy_endpoint.in_clusters.get( + LevelControl.cluster_id ) + self._color_cluster = endpoint.zigpy_endpoint.in_clusters.get(Color.cluster_id) + self._identify_cluster = device.identify_cluster self._refresh_task: asyncio.Task | None = None @@ -872,20 +1015,32 @@ def _gateway(self) -> Gateway: def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._on_off_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, - ) - ) - - if self._level_cluster_handler: + assert self._on_off_cluster is not None + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): self._on_remove_callbacks.append( - self._level_cluster_handler.on_event( - CLUSTER_HANDLER_LEVEL_CHANGED, self.handle_cluster_handler_set_level + self._on_off_cluster.on_event( + event_type.event_type, self.handle_attribute_updated ) ) + if self._level_cluster is not None: + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._level_cluster.on_event( + event_type.event_type, self.handle_level_attribute_updated + ) + ) + self.start_polling() def recompute_capabilities(self) -> None: @@ -895,32 +1050,37 @@ def recompute_capabilities(self) -> None: effect_list = [EFFECT_OFF] self._internal_supported_color_modes = {ColorMode.ONOFF} - if self._level_cluster_handler: + if self._level_cluster is not None: self._internal_supported_color_modes.add(ColorMode.BRIGHTNESS) self._supported_features |= LightEntityFeature.TRANSITION - self._brightness = self._level_cluster_handler.current_level + self._brightness = self._level_cluster.get( + LevelControl.AttributeDefs.current_level.name + ) - if self._color_cluster_handler: - self._min_mireds: int = self._color_cluster_handler.min_mireds - self._max_mireds: int = self._color_cluster_handler.max_mireds + if self._color_cluster is not None: + self._min_mireds: int = self._color_min_mireds + self._max_mireds: int = self._color_max_mireds - if self._color_cluster_handler.color_temp_supported: + if self._color_temp_supported: self._internal_supported_color_modes.add(ColorMode.COLOR_TEMP) - self._color_temp = self._color_cluster_handler.color_temperature + self._color_temp = self._color_temperature - if self._color_cluster_handler.xy_supported: + if self._color_xy_supported: self._internal_supported_color_modes.add(ColorMode.XY) - curr_x = self._color_cluster_handler.current_x - curr_y = self._color_cluster_handler.current_y + curr_x = self._color_cluster.get(Color.AttributeDefs.current_x.name) + curr_y = self._color_cluster.get(Color.AttributeDefs.current_y.name) if curr_x is not None and curr_y is not None: self._xy_color = (curr_x / 65535, curr_y / 65535) else: self._xy_color = (0, 0) - if self._color_cluster_handler.color_loop_supported: + if self._color_loop_supported: self._supported_features |= LightEntityFeature.EFFECT effect_list.append(EFFECT_COLORLOOP) - if self._color_cluster_handler.color_loop_active == 1: + if ( + self._color_cluster.get(Color.AttributeDefs.color_loop_active.name) + == 1 + ): self._effect = EFFECT_COLORLOOP self._supported_color_modes = supported_color_modes = ( @@ -929,28 +1089,36 @@ def recompute_capabilities(self) -> None: if len(supported_color_modes) == 1: self._color_mode = next(iter(supported_color_modes)) else: # Light supports color_temp + xy, determine which mode the light is in - assert self._color_cluster_handler + assert self._color_cluster is not None if ( - self._color_cluster_handler.color_mode + self._color_cluster.get(Color.AttributeDefs.color_mode.name) == Color.ColorMode.Color_temperature ): self._color_mode = ColorMode.COLOR_TEMP else: self._color_mode = ColorMode.XY - if self._identify_cluster_handler: + if self._identify_cluster is not None: self._supported_features |= LightEntityFeature.FLASH self._effect_list = effect_list - def handle_cluster_handler_set_level(self, event: LevelChangeEvent) -> None: + def handle_level_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, + ) -> None: """Set the brightness of this light between 0..254. brightness level 255 is a special value instructing the device to come on at `on_level` Zigbee attribute value, regardless of the last set level """ - value = max(0, min(254, event.level)) + if event.attribute_id != LevelControl.AttributeDefs.current_level.id: + return + value = max(0, min(254, event.value)) if self.is_transitioning: self.debug( "received level change event %s while transitioning - buffering", @@ -1003,25 +1171,26 @@ def transition_off(self): self.debug("group transition completed - unsetting member transitioning flag") self._transitioning_group = False - def handle_cluster_handler_attribute_updated( - self, event: ClusterAttributeUpdatedEvent + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> 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 - ): + if event.attribute_id != OnOff.AttributeDefs.on_off.id: return if self.is_transitioning: self.debug( "received onoff %s while transitioning - buffering", - event.attribute_value, + event.value, ) - if not event.attribute_value: + if not event.value: self._transition_brightness_buffer = 0 return - self._state = bool(event.attribute_value) - if event.attribute_value: + self._state = bool(event.value) + if event.value: self._off_with_transition = False self._off_brightness = None self.maybe_emit_state_changed_event() @@ -1040,10 +1209,14 @@ async def async_update(self) -> None: return self.debug("polling current state") - if self._on_off_cluster_handler: - state = await self._on_off_cluster_handler.get_attribute_value( - "on_off", from_cache=False + if self._on_off_cluster is not None: + results = await safe_read( + self._on_off_cluster, + [OnOff.AttributeDefs.on_off.name], + allow_cache=False, + only_cache=False, ) + state = results.get(OnOff.AttributeDefs.on_off.name) # check if transition started whilst waiting for polled state if self.is_transitioning: return # type: ignore[unreachable] @@ -1054,29 +1227,36 @@ async def async_update(self) -> None: self._off_with_transition = False self._off_brightness = None - if self._level_cluster_handler: - level = await self._level_cluster_handler.get_attribute_value( - "current_level", from_cache=False + if self._level_cluster is not None: + results = await safe_read( + self._level_cluster, + [LevelControl.AttributeDefs.current_level.name], + allow_cache=False, + only_cache=False, ) + level = results.get(LevelControl.AttributeDefs.current_level.name) # check if transition started whilst waiting for polled state if self.is_transitioning: return # type: ignore[unreachable] if level is not None: self._brightness = level - if self._color_cluster_handler: + if self._color_cluster is not None: attributes = [ - "color_mode", - "current_x", - "current_y", + Color.AttributeDefs.color_mode.name, + Color.AttributeDefs.current_x.name, + Color.AttributeDefs.current_y.name, ] - if self._color_cluster_handler.color_temp_supported: - attributes.append("color_temperature") - if self._color_cluster_handler.color_loop_supported: - attributes.append("color_loop_active") - - results = await self._color_cluster_handler.get_attributes( - attributes, from_cache=False, only_cache=False + if self._color_temp_supported: + attributes.append(Color.AttributeDefs.color_temperature.name) + if self._color_loop_supported: + attributes.append(Color.AttributeDefs.color_loop_active.name) + + results = await safe_read( + self._color_cluster, + attributes, + allow_cache=False, + only_cache=False, ) # although rare, a transition might have been started while we were waiting @@ -1123,11 +1303,9 @@ class HueLight(Light): _REFRESH_INTERVAL = (180, 300) - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), - optional_cluster_handlers=frozenset( - {CLUSTER_HANDLER_COLOR, CLUSTER_HANDLER_LEVEL} - ), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OnOff.cluster_id}), + optional_server_clusters=frozenset({Color.cluster_id, LevelControl.cluster_id}), manufacturers=frozenset({"Philips", "Signify Netherlands B.V."}), profile_device_types=LIGHT_PROFILE_DEVICE_TYPES, # We want this entity to be preferred over the base light @@ -1141,11 +1319,9 @@ class ForceOnLight(Light): _FORCE_ON = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), - optional_cluster_handlers=frozenset( - {CLUSTER_HANDLER_COLOR, CLUSTER_HANDLER_LEVEL} - ), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OnOff.cluster_id}), + optional_server_clusters=frozenset({Color.cluster_id, LevelControl.cluster_id}), manufacturers=frozenset( { "Jasco", @@ -1168,11 +1344,9 @@ class MinTransitionLight(Light): # Transitions are counted in 1/10th of a second increments, so this is the smallest _DEFAULT_MIN_TRANSITION_TIME = 0.1 - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), - optional_cluster_handlers=frozenset( - {CLUSTER_HANDLER_COLOR, CLUSTER_HANDLER_LEVEL} - ), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OnOff.cluster_id}), + optional_server_clusters=frozenset({Color.cluster_id, LevelControl.cluster_id}), manufacturers=DEFAULT_MIN_TRANSITION_MANUFACTURERS, profile_device_types=LIGHT_PROFILE_DEVICE_TYPES, # We want this entity to be preferred over the base light @@ -1181,7 +1355,7 @@ class MinTransitionLight(Light): @register_group_entity -class LightGroup(BaseClusterHandlerLight, GroupEntity): +class LightGroup(BaseSharedLight, GroupEntity): """Representation of a light group.""" _attr_always_supported = True @@ -1190,22 +1364,10 @@ def __init__(self, group: Group): """Initialize a light group.""" super().__init__(group) - # TODO: these type annotations are not correct, these are not cluster handler - # objects but are instead cluster proxies! - self._on_off_cluster_handler: OnOffClusterHandler = cast( - OnOffClusterHandler, group.zigpy_group.endpoint[OnOff.cluster_id] - ) - self._level_cluster_handler: LevelControlClusterHandler | None = cast( - LevelControlClusterHandler | None, - group.zigpy_group.endpoint[LevelControl.cluster_id], - ) - self._color_cluster_handler: ColorClusterHandler | None = cast( - ColorClusterHandler | None, group.zigpy_group.endpoint[Color.cluster_id] - ) - self._identify_cluster_handler: IdentifyClusterHandler | None = cast( - IdentifyClusterHandler | None, - group.zigpy_group.endpoint[Identify.cluster_id], - ) + self._on_off_cluster = group.zigpy_group.endpoint[OnOff.cluster_id] + self._level_cluster = group.zigpy_group.endpoint[LevelControl.cluster_id] + self._color_cluster = group.zigpy_group.endpoint[Color.cluster_id] + self._identify_cluster = group.zigpy_group.endpoint[Identify.cluster_id] self._debounced_member_refresh: Debouncer | None = Debouncer( self.group.gateway, @@ -1254,13 +1416,17 @@ def recompute_capabilities(self) -> None: # If at least one member has a color cluster and doesn't support it, # it's not used. for endpoint in member.device._endpoints.values(): - for cluster_handler in endpoint.all_cluster_handlers.values(): - if ( - cluster_handler.name == CLUSTER_HANDLER_COLOR - and not cluster_handler.execute_if_off_supported - ): - self._GROUP_SUPPORTS_EXECUTE_IF_OFF = False - break + color_cluster = endpoint.zigpy_endpoint.in_clusters.get( + Color.cluster_id + ) + if color_cluster is None: + continue + options = Color.Options( + color_cluster.get(Color.AttributeDefs.options.name, 0) + ) + if Color.Options.Execute_if_off not in options: + self._GROUP_SUPPORTS_EXECUTE_IF_OFF = False + break self._color_mode = ColorMode.UNKNOWN self._internal_supported_color_modes = {ColorMode.ONOFF} @@ -1446,7 +1612,7 @@ def _make_members_assume_group_state( brightness_supported = ( is_brightness_supported(supported_modes) - and platform_entity._level_cluster_handler is not None + and platform_entity._level_cluster is not None ) # unset "off brightness" and "off with transition" diff --git a/zha/application/platforms/lock/__init__.py b/zha/application/platforms/lock/__init__.py index 124ff15c3..563e51b99 100644 --- a/zha/application/platforms/lock/__init__.py +++ b/zha/application/platforms/lock/__init__.py @@ -3,14 +3,24 @@ from __future__ import annotations from abc import ABC, abstractmethod -from typing import TYPE_CHECKING, Any, Literal, cast - +from typing import TYPE_CHECKING, Any, Literal + +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, +) from zigpy.zcl.clusters.closures import DoorLock as DoorLockCluster from zigpy.zcl.foundation import Status from zha.application import Platform +from zha.application.helpers import safe_read from zha.application.platforms import ( - ClusterHandlerMatch, + AttrConfig, + ClusterConfig, + ClusterMatch, PlatformEntity, register_entity, ) @@ -19,15 +29,8 @@ STATE_UNLOCKED, VALUE_TO_STATE, ) -from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent -from zha.zigbee.cluster_handlers.closures import DoorLockClusterHandler -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_DOORLOCK, -) if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint @@ -65,35 +68,50 @@ class DoorLock(BaseLock): _attr_translation_key: str = "door_lock" _attr_primary_weight = 5 - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_DOORLOCK}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({DoorLockCluster.cluster_id}), ) + _server_cluster_config = { + DoorLockCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + DoorLockCluster.AttributeDefs.lock_state: AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } + def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs, ) -> None: """Initialize the lock.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) - self._doorlock_cluster_handler: DoorLockClusterHandler = cast( - DoorLockClusterHandler, self.cluster_handlers[CLUSTER_HANDLER_DOORLOCK] - ) + super().__init__(endpoint=endpoint, device=device, **kwargs) self._state: str | None = VALUE_TO_STATE.get( - self._doorlock_cluster_handler.cluster.get("lock_state"), None + self._cluster.get(DoorLockCluster.AttributeDefs.lock_state.name), None ) def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._doorlock_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) @property def is_locked(self) -> bool: @@ -104,7 +122,7 @@ def is_locked(self) -> bool: async def async_lock(self) -> None: """Lock the lock.""" - result = await self._doorlock_cluster_handler.lock_door() + result = await self._cluster.lock_door() if result[0] is not Status.SUCCESS: self.error("Error with lock_door: %s", result) return @@ -114,7 +132,7 @@ async def async_lock(self) -> None: async def async_unlock(self) -> None: """Unlock the lock.""" - result = await self._doorlock_cluster_handler.unlock_door() + result = await self._cluster.unlock_door() if result[0] is not Status.SUCCESS: self.error("Error with unlock_door: %s", result) return @@ -124,39 +142,59 @@ async def async_unlock(self) -> None: async def async_set_lock_user_code(self, code_slot: int, user_code: str) -> None: """Set the user_code to index X on the lock.""" - if self._doorlock_cluster_handler: - await self._doorlock_cluster_handler.async_set_user_code( - code_slot, user_code - ) - self.debug("User code at slot %s set", code_slot) + await self._cluster.set_pin_code( + code_slot - 1, # start code slots at 1, Zigbee internals use 0 + DoorLockCluster.UserStatus.Enabled, + DoorLockCluster.UserType.Unrestricted, + user_code, + ) + self.debug("User code at slot %s set", code_slot) async def async_enable_lock_user_code(self, code_slot: int) -> None: """Enable user_code at index X on the lock.""" - if self._doorlock_cluster_handler: - await self._doorlock_cluster_handler.async_enable_user_code(code_slot) - self.debug("User code at slot %s enabled", code_slot) + await self._cluster.set_user_status( + code_slot - 1, DoorLockCluster.UserStatus.Enabled + ) + self.debug("User code at slot %s enabled", code_slot) async def async_disable_lock_user_code(self, code_slot: int) -> None: """Disable user_code at index X on the lock.""" - if self._doorlock_cluster_handler: - await self._doorlock_cluster_handler.async_disable_user_code(code_slot) - self.debug("User code at slot %s disabled", code_slot) + await self._cluster.set_user_status( + code_slot - 1, DoorLockCluster.UserStatus.Disabled + ) + self.debug("User code at slot %s disabled", code_slot) async def async_clear_lock_user_code(self, code_slot: int) -> None: """Clear the user_code at index X on the lock.""" - if self._doorlock_cluster_handler: - await self._doorlock_cluster_handler.async_clear_user_code(code_slot) - self.debug("User code at slot %s cleared", code_slot) + await self._cluster.clear_pin_code(code_slot - 1) + self.debug("User code at slot %s cleared", code_slot) - def handle_cluster_handler_attribute_updated( - self, event: ClusterAttributeUpdatedEvent + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: - """Handle state update from cluster handler.""" + """Handle state update from the door-lock cluster.""" if event.attribute_id != DoorLockCluster.AttributeDefs.lock_state.id: return - self._state = VALUE_TO_STATE.get(event.attribute_value, self._state) + self._state = VALUE_TO_STATE.get(event.value, self._state) self.maybe_emit_state_changed_event() + async def async_update(self) -> None: + """Poll lock_state from the cluster.""" + await safe_read( + self._cluster, + [DoorLockCluster.AttributeDefs.lock_state.name], + allow_cache=False, + only_cache=False, + ) + value = self._cluster.get(DoorLockCluster.AttributeDefs.lock_state.name) + if value is not None: + self._state = VALUE_TO_STATE.get(value, self._state) + self.maybe_emit_state_changed_event() + def restore_external_state_attributes( self, *, diff --git a/zha/application/platforms/number/__init__.py b/zha/application/platforms/number/__init__.py index b4d2f2002..0f437e077 100644 --- a/zha/application/platforms/number/__init__.py +++ b/zha/application/platforms/number/__init__.py @@ -10,46 +10,44 @@ from zhaquirks.quirk_ids import DANFOSS_ALLY_THERMOSTAT from zigpy.quirks.v2 import NumberMetadata +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, +) from zigpy.zcl.clusters.general import AnalogOutput, Basic, LevelControl from zigpy.zcl.clusters.hvac import Thermostat from zigpy.zcl.clusters.lighting import Ballast, Color from zigpy.zcl.clusters.measurement import OccupancySensing from zha.application import Platform +from zha.application.helpers import safe_read, write_attributes_safe from zha.application.platforms import ( + AttrConfig, BaseEntityInfo, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, EntityCategory, PlatformEntity, PlatformFeatureGroup, register_entity, ) -from zha.application.platforms.helpers import validate_device_class -from zha.application.platforms.number.bacnet import BACNET_UNITS_TO_HA_UNITS -from zha.application.platforms.number.const import ICONS, NumberDeviceClass, NumberMode -from zha.units import UnitOfMass, UnitOfTemperature, UnitOfTime -from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent -from zha.zigbee.cluster_handlers.const import ( +from zha.application.platforms.const import ( AQARA_OPPLE_CLUSTER, - CLUSTER_HANDLER_ANALOG_OUTPUT, - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_BALLAST, - CLUSTER_HANDLER_BASIC, - CLUSTER_HANDLER_COLOR, - CLUSTER_HANDLER_INOVELLI, - CLUSTER_HANDLER_LEVEL, - CLUSTER_HANDLER_OCCUPANCY, - CLUSTER_HANDLER_THERMOSTAT, IKEA_AIR_PURIFIER_CLUSTER, INOVELLI_CLUSTER, SINOPE_MANUFACTURER_CLUSTER, TUYA_MANUFACTURER_CLUSTER, ) +from zha.application.platforms.helpers import validate_device_class +from zha.application.platforms.number.bacnet import BACNET_UNITS_TO_HA_UNITS +from zha.application.platforms.number.const import ICONS, NumberDeviceClass, NumberMode +from zha.units import UnitOfMass, UnitOfTemperature, UnitOfTime if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler - from zha.zigbee.device import Device - from zha.zigbee.endpoint import Endpoint + pass _LOGGER = logging.getLogger(__name__) @@ -137,67 +135,118 @@ async def async_set_native_value(self, value: float) -> None: class AnalogOutputNumber(BaseNumber): """Representation of a ZHA Number entity.""" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ANALOG_OUTPUT}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({AnalogOutput.cluster_id}), ) - def __init__( - self, - cluster_handlers: list[ClusterHandler], - endpoint: Endpoint, - device: Device, - **kwargs: Any, - ): - """Initialize the number.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) - self._analog_output_cluster_handler: ClusterHandler = self.cluster_handlers[ - CLUSTER_HANDLER_ANALOG_OUTPUT - ] + _server_cluster_config = { + AnalogOutput.cluster_id: ClusterConfig( + bind=True, + attributes={ + AnalogOutput.AttributeDefs.present_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + AnalogOutput.AttributeDefs.min_present_value: AttrConfig( + read_on_startup=False, + ), + AnalogOutput.AttributeDefs.max_present_value: AttrConfig( + read_on_startup=False, + ), + AnalogOutput.AttributeDefs.resolution: AttrConfig( + read_on_startup=False, + ), + AnalogOutput.AttributeDefs.relinquish_default: AttrConfig( + read_on_startup=False, + ), + AnalogOutput.AttributeDefs.description: AttrConfig( + read_on_startup=False, + ), + AnalogOutput.AttributeDefs.engineering_units: AttrConfig( + read_on_startup=False, + ), + AnalogOutput.AttributeDefs.application_type: AttrConfig( + read_on_startup=False, + ), + }, + ), + } def recompute_capabilities(self) -> None: """Recompute capabilities.""" super().recompute_capabilities() - analog_output = self._analog_output_cluster_handler - self._attr_native_min_value = analog_output.min_present_value or 0 - self._attr_native_max_value = analog_output.max_present_value or 1023 - self._attr_native_step = analog_output.resolution + min_val = self._cluster.get(AnalogOutput.AttributeDefs.min_present_value.name) + max_val = self._cluster.get(AnalogOutput.AttributeDefs.max_present_value.name) + self._attr_native_min_value = min_val or 0 + self._attr_native_max_value = max_val or 1023 + self._attr_native_step = self._cluster.get( + AnalogOutput.AttributeDefs.resolution.name + ) self._attr_native_unit_of_measurement = BACNET_UNITS_TO_HA_UNITS.get( - analog_output.engineering_units + self._cluster.get(AnalogOutput.AttributeDefs.engineering_units.name) ) - if analog_output.application_type is not None: - self._attr_icon = ICONS.get(analog_output.application_type >> 16) + application_type = self._cluster.get( + AnalogOutput.AttributeDefs.application_type.name + ) + if application_type is not None: + self._attr_icon = ICONS.get(application_type >> 16) else: self._attr_icon = None - self._attr_fallback_name = analog_output.description + self._attr_fallback_name = self._cluster.get( + AnalogOutput.AttributeDefs.description.name + ) def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._analog_output_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) @property def native_value(self) -> float | None: """Return the current value.""" - return self._analog_output_cluster_handler.present_value + return self._cluster.get(AnalogOutput.AttributeDefs.present_value.name) async def async_set_native_value(self, value: float) -> None: """Update the current value from HA.""" - await self._analog_output_cluster_handler.async_set_present_value(float(value)) + await write_attributes_safe( + self._cluster, + {AnalogOutput.AttributeDefs.present_value.name: float(value)}, + ) self.maybe_emit_state_changed_event() - def handle_cluster_handler_attribute_updated( + async def async_update(self) -> None: + """Poll present_value from the cluster.""" + await safe_read( + self._cluster, + [AnalogOutput.AttributeDefs.present_value.name], + allow_cache=False, + only_cache=False, + ) + self.maybe_emit_state_changed_event() + + def handle_attribute_updated( self, - event: ClusterAttributeUpdatedEvent, # pylint: disable=unused-argument + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: - """Handle value update from cluster handler.""" + """Handle value update from cluster.""" self.maybe_emit_state_changed_event() @@ -211,28 +260,12 @@ class NumberConfigurationEntity(BaseNumber): _multiplier: float = 1 _attribute_name: str - def __init__( - self, - cluster_handlers: list[ClusterHandler], - endpoint: Endpoint, - device: Device, - **kwargs: Any, - ) -> None: - """Init this number configuration entity.""" - self._cluster_handler: ClusterHandler = cluster_handlers[0] - super().__init__(cluster_handlers, endpoint, device, **kwargs) - def _is_supported(self) -> bool: """Return if the entity is supported for the device, internal.""" if ( - ( - self._attribute_name - not in self._cluster_handler.cluster.attributes_by_name - ) - or self._cluster_handler.cluster.is_attribute_unsupported( - self._attribute_name - ) - or self._cluster_handler.cluster.get(self._attribute_name) is None + self._attribute_name not in self._cluster.attributes_by_name + or self._cluster.is_attribute_unsupported(self._attribute_name) + or self._cluster.get(self._attribute_name) is None ): _LOGGER.debug( "%s is not supported - skipping %s entity creation", @@ -246,12 +279,17 @@ def _is_supported(self) -> bool: def on_add(self) -> None: """Initialize entity.""" super().on_add() - self._on_remove_callbacks.append( - self._cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) def _init_from_quirks_metadata(self, entity_metadata: NumberMetadata) -> None: """Init this entity from the quirks metadata.""" @@ -288,34 +326,38 @@ def state(self) -> dict[str, Any]: @property def native_value(self) -> float | None: """Return the current value.""" - value = self._cluster_handler.cluster.get(self._attribute_name) + value = self._cluster.get(self._attribute_name) if value is None: return None return value * self._multiplier async def async_set_native_value(self, value: float) -> None: """Update the current value from HA.""" - await self._cluster_handler.write_attributes_safe( - {self._attribute_name: int(value / self._multiplier)} + await write_attributes_safe( + self._cluster, {self._attribute_name: int(value / self._multiplier)} ) self.maybe_emit_state_changed_event() async def async_update(self) -> None: """Attempt to retrieve the state of the entity.""" - await super().async_update() _LOGGER.debug("polling current state") - if self._cluster_handler: - value = await self._cluster_handler.get_attribute_value( - self._attribute_name, from_cache=False - ) - _LOGGER.debug("read value=%s", value) - # The attribute update handler below takes care of the rest + result = await safe_read( + self._cluster, + [self._attribute_name], + allow_cache=False, + only_cache=False, + ) + _LOGGER.debug("read value=%s", result.get(self._attribute_name)) + self.maybe_emit_state_changed_event() - def handle_cluster_handler_attribute_updated( + def handle_attribute_updated( self, - event: ClusterAttributeUpdatedEvent, # pylint: disable=unused-argument + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: - """Handle value update from cluster handler.""" + """Handle value update from cluster.""" if event.attribute_name == self._attribute_name: self.maybe_emit_state_changed_event() @@ -329,9 +371,10 @@ class AqaraMotionDetectionInterval(NumberConfigurationEntity): _attr_native_max_value: float = 65535 _attribute_name = "detection_interval" _attr_translation_key: str = "detection_interval" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.motion.ac02", "lumi.motion.agl04"}), ) @@ -345,11 +388,44 @@ class OnOffTransitionTimeConfigurationEntity(NumberConfigurationEntity): _attr_native_max_value: float = 0xFFFF _attribute_name = "on_off_transition_time" _attr_translation_key: str = "on_off_transition_time" + _cluster_id = LevelControl.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_LEVEL}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({LevelControl.cluster_id}), ) + _server_cluster_config = { + LevelControl.cluster_id: ClusterConfig( + bind=True, + attributes={ + LevelControl.AttributeDefs.current_level: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=1, max_interval=900, reportable_change=1 + ), + ), + LevelControl.AttributeDefs.on_off_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.on_level: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.on_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.off_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.default_move_rate: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.start_up_current_level: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + @register_entity(LevelControl.cluster_id) class OnLevelConfigurationEntity(NumberConfigurationEntity): @@ -360,9 +436,10 @@ class OnLevelConfigurationEntity(NumberConfigurationEntity): _attr_native_max_value: float = 0xFF _attribute_name = "on_level" _attr_translation_key: str = "on_level" + _cluster_id = LevelControl.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_LEVEL}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({LevelControl.cluster_id}), ) @@ -375,9 +452,10 @@ class OnTransitionTimeConfigurationEntity(NumberConfigurationEntity): _attr_native_max_value: float = 0xFFFE _attribute_name = "on_transition_time" _attr_translation_key: str = "on_transition_time" + _cluster_id = LevelControl.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_LEVEL}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({LevelControl.cluster_id}), ) @@ -390,9 +468,10 @@ class OffTransitionTimeConfigurationEntity(NumberConfigurationEntity): _attr_native_max_value: float = 0xFFFE _attribute_name = "off_transition_time" _attr_translation_key: str = "off_transition_time" + _cluster_id = LevelControl.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_LEVEL}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({LevelControl.cluster_id}), ) @@ -406,9 +485,10 @@ class DefaultMoveRateConfigurationEntity(NumberConfigurationEntity): _attr_native_max_value: float = 0xFE _attribute_name = "default_move_rate" _attr_translation_key: str = "default_move_rate" + _cluster_id = LevelControl.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_LEVEL}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({LevelControl.cluster_id}), ) @@ -421,9 +501,10 @@ class StartUpCurrentLevelConfigurationEntity(NumberConfigurationEntity): _attr_native_max_value: float = 0xFF _attribute_name = "start_up_current_level" _attr_translation_key: str = "start_up_current_level" + _cluster_id = LevelControl.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_LEVEL}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({LevelControl.cluster_id}), ) @@ -436,16 +517,74 @@ class StartUpColorTemperatureConfigurationEntity(NumberConfigurationEntity): _attr_native_max_value: float = 500 _attribute_name = "start_up_color_temperature" _attr_translation_key: str = "start_up_color_temperature" + _cluster_id = Color.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_COLOR}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({Color.cluster_id}), ) + _server_cluster_config = { + Color.cluster_id: ClusterConfig( + bind=True, + attributes={ + Color.AttributeDefs.current_x: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Color.AttributeDefs.current_y: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Color.AttributeDefs.color_temperature: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Color.AttributeDefs.color_mode: AttrConfig( + read_on_startup=True, + ), + Color.AttributeDefs.color_temp_physical_min: AttrConfig( + read_on_startup=False, + ), + Color.AttributeDefs.color_temp_physical_max: AttrConfig( + read_on_startup=False, + ), + Color.AttributeDefs.color_capabilities: AttrConfig( + read_on_startup=False, + ), + Color.AttributeDefs.color_loop_active: AttrConfig( + read_on_startup=True, + ), + Color.AttributeDefs.start_up_color_temperature: AttrConfig( + read_on_startup=False, + ), + Color.AttributeDefs.options: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def recompute_capabilities(self) -> None: """Recompute capabilities.""" super().recompute_capabilities() - self._attr_native_min_value = self._cluster_handler.min_mireds - self._attr_native_max_value = self._cluster_handler.max_mireds + min_mireds = self._cluster.get( + Color.AttributeDefs.color_temp_physical_min.name, 153 + ) + if min_mireds == 0: + min_mireds = 153 + max_mireds = self._cluster.get( + Color.AttributeDefs.color_temp_physical_max.name, 500 + ) + if max_mireds == 0: + max_mireds = 500 + self._attr_native_min_value = min_mireds + self._attr_native_max_value = max_mireds @register_entity(Ballast.cluster_id) @@ -458,11 +597,26 @@ class BallastMinLevel(NumberConfigurationEntity): _attr_native_max_value: float = 0xFE _attribute_name = "min_level" _attr_translation_key: str = "minimum_dimming_level" + _cluster_id = Ballast.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_BALLAST}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({Ballast.cluster_id}), ) + _server_cluster_config = { + Ballast.cluster_id: ClusterConfig( + bind=True, + attributes={ + Ballast.AttributeDefs.min_level: AttrConfig( + read_on_startup=True, + ), + Ballast.AttributeDefs.max_level: AttrConfig( + read_on_startup=True, + ), + }, + ), + } + @register_entity(Ballast.cluster_id) class BallastMaxLevel(NumberConfigurationEntity): @@ -474,9 +628,10 @@ class BallastMaxLevel(NumberConfigurationEntity): _attr_native_max_value: float = 0xFE _attribute_name = "max_level" _attr_translation_key: str = "maximum_dimming_level" + _cluster_id = Ballast.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_BALLAST}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({Ballast.cluster_id}), ) @@ -491,11 +646,32 @@ class PIROccupiedToUnoccupiedDelayConfigurationEntity(NumberConfigurationEntity) _attr_native_unit_of_measurement: str = UnitOfTime.SECONDS _attribute_name = "pir_o_to_u_delay" _attr_translation_key: str = "pir_o_to_u_delay" + _cluster_id = OccupancySensing.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_OCCUPANCY}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({OccupancySensing.cluster_id}), ) + _server_cluster_config = { + OccupancySensing.cluster_id: ClusterConfig( + bind=True, + attributes={ + OccupancySensing.AttributeDefs.occupancy: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + OccupancySensing.AttributeDefs.pir_o_to_u_delay: AttrConfig( + read_on_startup=False, + ), + OccupancySensing.AttributeDefs.pir_u_to_o_delay: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + @register_entity(OccupancySensing.cluster_id) class PIRUnoccupiedToOccupiedDelayConfigurationEntity(NumberConfigurationEntity): @@ -508,9 +684,10 @@ class PIRUnoccupiedToOccupiedDelayConfigurationEntity(NumberConfigurationEntity) _attr_native_unit_of_measurement: str = UnitOfTime.SECONDS _attribute_name = "pir_u_to_o_delay" _attr_translation_key: str = "pir_u_to_o_delay" + _cluster_id = OccupancySensing.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_OCCUPANCY}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({OccupancySensing.cluster_id}), ) @@ -524,11 +701,12 @@ class SonoffPresenceSenorTimeout(NumberConfigurationEntity): _attr_native_max_value: int = 60 _attribute_name = "ultrasonic_o_to_u_delay" _attr_translation_key: str = "presence_detection_timeout" + _cluster_id = OccupancySensing.cluster_id _attr_mode: NumberMode = NumberMode.BOX - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_OCCUPANCY}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OccupancySensing.cluster_id}), models=frozenset({"SNZB-06P", "SNZB-03P"}), ) @@ -544,9 +722,10 @@ class TimerDurationMinutes(NumberConfigurationEntity): _attr_native_unit_of_measurement: str = UnitOfTime.MINUTES _attribute_name = "timer_duration" _attr_translation_key: str = "timer_duration" + _cluster_id = TUYA_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"tuya_manufacturer"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({TUYA_MANUFACTURER_CLUSTER}), manufacturers=frozenset({"_TZE200_htnnfasr"}), ) @@ -562,9 +741,10 @@ class FilterLifeTime(NumberConfigurationEntity): _attr_native_unit_of_measurement: str = UnitOfTime.MINUTES _attribute_name = "filter_life_time" _attr_translation_key: str = "filter_life_time" + _cluster_id = IKEA_AIR_PURIFIER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"ikea_airpurifier"}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({IKEA_AIR_PURIFIER_CLUSTER}), ) @@ -577,13 +757,23 @@ class TiRouterTransmitPower(NumberConfigurationEntity): _attr_native_max_value: float = 20 _attribute_name = "transmit_power" _attr_translation_key: str = "transmit_power" + _cluster_id = Basic.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_BASIC}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Basic.cluster_id}), manufacturers=frozenset({"TexasInstruments"}), models=frozenset({"ti.router"}), ) + _server_cluster_config = { + Basic.cluster_id: ClusterConfig( + bind=False, + attributes={ + "transmit_power": AttrConfig(read_on_startup=False), + }, + ), + } + @register_entity(INOVELLI_CLUSTER) class InovelliRemoteDimmingUpSpeed(NumberConfigurationEntity): @@ -596,8 +786,10 @@ class InovelliRemoteDimmingUpSpeed(NumberConfigurationEntity): _attribute_name = "dimming_speed_up_remote" _attr_translation_key: str = "dimming_speed_up_remote" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -612,8 +804,10 @@ class InovelliButtonDelay(NumberConfigurationEntity): _attribute_name = "button_delay" _attr_translation_key: str = "button_delay" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -628,8 +822,10 @@ class InovelliLocalDimmingUpSpeed(NumberConfigurationEntity): _attribute_name = "dimming_speed_up_local" _attr_translation_key: str = "dimming_speed_up_local" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -644,8 +840,10 @@ class InovelliLocalRampRateOffToOn(NumberConfigurationEntity): _attribute_name = "ramp_rate_off_to_on_local" _attr_translation_key: str = "ramp_rate_off_to_on_local" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -660,8 +858,10 @@ class InovelliRemoteDimmingSpeedOffToOn(NumberConfigurationEntity): _attribute_name = "ramp_rate_off_to_on_remote" _attr_translation_key: str = "ramp_rate_off_to_on_remote" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -676,8 +876,10 @@ class InovelliRemoteDimmingDownSpeed(NumberConfigurationEntity): _attribute_name = "dimming_speed_down_remote" _attr_translation_key: str = "dimming_speed_down_remote" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -692,8 +894,10 @@ class InovelliLocalDimmingDownSpeed(NumberConfigurationEntity): _attribute_name = "dimming_speed_down_local" _attr_translation_key: str = "dimming_speed_down_local" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -708,8 +912,10 @@ class InovelliLocalRampRateOnToOff(NumberConfigurationEntity): _attribute_name = "ramp_rate_on_to_off_local" _attr_translation_key: str = "ramp_rate_on_to_off_local" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -724,8 +930,10 @@ class InovelliRemoteDimmingSpeedOnToOff(NumberConfigurationEntity): _attribute_name = "ramp_rate_on_to_off_remote" _attr_translation_key: str = "ramp_rate_on_to_off_remote" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -740,8 +948,10 @@ class InovelliMinimumLoadDimmingLevel(NumberConfigurationEntity): _attribute_name = "minimum_level" _attr_translation_key: str = "minimum_level" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -756,8 +966,10 @@ class InovelliMaximumLoadDimmingLevel(NumberConfigurationEntity): _attribute_name = "maximum_level" _attr_translation_key: str = "maximum_level" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -772,8 +984,10 @@ class InovelliAutoShutoffTimer(NumberConfigurationEntity): _attribute_name = "auto_off_timer" _attr_translation_key: str = "auto_off_timer" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -788,8 +1002,10 @@ class InovelliLocalDefaultLevel(NumberConfigurationEntity): _attribute_name = "default_level_local" _attr_translation_key: str = "default_level_local" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -804,8 +1020,10 @@ class InovelliRemoteDefaultLevel(NumberConfigurationEntity): _attribute_name = "default_level_remote" _attr_translation_key: str = "default_level_remote" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -820,8 +1038,10 @@ class InovelliStartupDefaultLevel(NumberConfigurationEntity): _attribute_name = "state_after_power_restored" _attr_translation_key: str = "state_after_power_restored" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -836,8 +1056,10 @@ class InovelliQuickStartTime(NumberConfigurationEntity): _attribute_name = "quick_start_time" _attr_translation_key: str = "quick_start_time" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), models=frozenset({"VZM35-SN"}), ) @@ -853,8 +1075,10 @@ class InovelliLoadLevelIndicatorTimeout(NumberConfigurationEntity): _attribute_name = "load_level_indicator_timeout" _attr_translation_key: str = "load_level_indicator_timeout" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -869,8 +1093,10 @@ class InovelliDefaultAllLEDOnColor(NumberConfigurationEntity): _attribute_name = "led_color_when_on" _attr_translation_key: str = "led_color_when_on" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -885,8 +1111,10 @@ class InovelliDefaultAllLEDOffColor(NumberConfigurationEntity): _attribute_name = "led_color_when_off" _attr_translation_key: str = "led_color_when_off" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -901,8 +1129,10 @@ class InovelliDefaultAllLEDOnIntensity(NumberConfigurationEntity): _attribute_name = "led_intensity_when_on" _attr_translation_key: str = "led_intensity_when_on" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -917,8 +1147,10 @@ class InovelliDefaultAllLEDOffIntensity(NumberConfigurationEntity): _attribute_name = "led_intensity_when_off" _attr_translation_key: str = "led_intensity_when_off" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -933,8 +1165,10 @@ class InovelliDoubleTapUpLevel(NumberConfigurationEntity): _attribute_name = "double_tap_up_level" _attr_translation_key: str = "double_tap_up_level" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -949,8 +1183,10 @@ class InovelliDoubleTapDownLevel(NumberConfigurationEntity): _attribute_name = "double_tap_down_level" _attr_translation_key: str = "double_tap_down_level" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -964,11 +1200,12 @@ class AqaraPetFeederServingSize(NumberConfigurationEntity): _attr_native_max_value: float = 10 _attribute_name = "serving_size" _attr_translation_key: str = "serving_size" + _cluster_id = AQARA_OPPLE_CLUSTER _attr_mode: NumberMode = NumberMode.BOX - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"aqara.feeder.acn001"}), ) @@ -983,12 +1220,13 @@ class AqaraPetFeederPortionWeight(NumberConfigurationEntity): _attr_native_max_value: float = 100 _attribute_name = "portion_weight" _attr_translation_key: str = "portion_weight" + _cluster_id = AQARA_OPPLE_CLUSTER _attr_mode: NumberMode = NumberMode.BOX _attr_native_unit_of_measurement: str = UnitOfMass.GRAMS - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"aqara.feeder.acn001"}), ) @@ -1004,12 +1242,13 @@ class AqaraThermostatAwayTemp(NumberConfigurationEntity): _multiplier: float = 0.01 _attribute_name = "away_preset_temperature" _attr_translation_key: str = "away_preset_temperature" + _cluster_id = AQARA_OPPLE_CLUSTER _attr_mode: NumberMode = NumberMode.SLIDER _attr_native_unit_of_measurement: str = UnitOfTemperature.CELSIUS - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.airrtc.agl001"}), ) @@ -1025,15 +1264,126 @@ class ThermostatLocalTempCalibration(NumberConfigurationEntity): _multiplier: float = 0.1 _attribute_name = "local_temperature_calibration" _attr_translation_key: str = "local_temperature_calibration" + _cluster_id = Thermostat.cluster_id _attr_mode: NumberMode = NumberMode.BOX _attr_native_unit_of_measurement: str = UnitOfTemperature.CELSIUS - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), feature_priority=(PlatformFeatureGroup.LOCAL_TEMPERATURE_CALIBRATION, 0), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + Thermostat.AttributeDefs.local_temperature: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.occupied_cooling_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.occupied_heating_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.unoccupied_cooling_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.unoccupied_heating_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.running_mode: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.running_state: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.system_mode: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.occupancy: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.pi_cooling_demand: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=5 + ), + ), + Thermostat.AttributeDefs.pi_heating_demand: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=5 + ), + ), + Thermostat.AttributeDefs.abs_min_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.abs_max_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.abs_min_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.abs_max_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.ctrl_sequence_of_oper: AttrConfig( + read_on_startup=True, + ), + Thermostat.AttributeDefs.max_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.max_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.min_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.min_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.local_temperature_calibration: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.setpoint_change_source: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.setpoint_change_source_timestamp: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + @register_entity(Thermostat.cluster_id) class SonoffThermostatLocalTempCalibration(ThermostatLocalTempCalibration): @@ -1043,8 +1393,8 @@ class SonoffThermostatLocalTempCalibration(ThermostatLocalTempCalibration): _attr_native_max_value: float = 12.7 _attr_native_step: float = 0.1 - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), models=frozenset({"TRVZB"}), feature_priority=(PlatformFeatureGroup.LOCAL_TEMPERATURE_CALIBRATION, 1), ) @@ -1058,8 +1408,8 @@ class BoschThermostatLocalTempCalibration(ThermostatLocalTempCalibration): _attr_native_max_value: float = 5.0 _attr_native_step: float = 0.1 - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), models=frozenset( { "RBSH-RTH0-ZB-EU", @@ -1090,13 +1440,13 @@ def recompute_capabilities(self) -> None: """Recompute capabilities.""" super().recompute_capabilities() self._attr_native_min_value = ( - self._cluster_handler.cluster.get( + self._cluster.get( Thermostat.AttributeDefs.abs_min_heat_setpoint_limit.name, -27315 ) * self._multiplier ) self._attr_native_max_value = ( - self._cluster_handler.cluster.get( + self._cluster.get( Thermostat.AttributeDefs.abs_max_heat_setpoint_limit.name, 0x7FFF ) * self._multiplier @@ -1114,16 +1464,17 @@ class MaxHeatSetpointLimit(ZCLHeatSetpointLimitEntity): _attribute_name: str = "max_heat_setpoint_limit" _attr_translation_key: str = "max_heat_setpoint_limit" _attr_entity_category = EntityCategory.CONFIG + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), ) def recompute_capabilities(self) -> None: """Recompute capabilities.""" super().recompute_capabilities() self._attr_native_min_value = ( - self._cluster_handler.cluster.get( + self._cluster.get( Thermostat.AttributeDefs.min_heat_setpoint_limit.name, -27315 ) * self._multiplier @@ -1141,16 +1492,17 @@ class MinHeatSetpointLimit(ZCLHeatSetpointLimitEntity): _attribute_name: str = "min_heat_setpoint_limit" _attr_translation_key: str = "min_heat_setpoint_limit" _attr_entity_category = EntityCategory.CONFIG + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), ) def recompute_capabilities(self) -> None: """Recompute capabilities.""" super().recompute_capabilities() self._attr_native_max_value = ( - self._cluster_handler.cluster.get( + self._cluster.get( Thermostat.AttributeDefs.max_heat_setpoint_limit.name, 0x7FFF ) * self._multiplier @@ -1168,9 +1520,10 @@ class DanfossExerciseTriggerTime(NumberConfigurationEntity): _attr_native_max_value: int = 1439 _attr_mode: NumberMode = NumberMode.BOX _attr_native_unit_of_measurement: str = UnitOfTime.MINUTES + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) @@ -1184,9 +1537,10 @@ class DanfossExternalMeasuredRoomSensor(ZCLTemperatureEntity): _attr_translation_key: str = "external_temperature_sensor" _attr_native_min_value: float = -80 _attr_native_max_value: float = 35 + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) @@ -1201,9 +1555,10 @@ class DanfossLoadRoomMean(NumberConfigurationEntity): _attr_native_min_value: int = -8000 _attr_native_max_value: int = 2000 _attr_mode: NumberMode = NumberMode.BOX + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) @@ -1221,9 +1576,10 @@ class DanfossRegulationSetpointOffset(NumberConfigurationEntity): _attr_native_max_value: float = 2.5 _attr_native_step: float = 0.1 _multiplier = 1 / 10 + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) @@ -1238,9 +1594,10 @@ class SinopeDimmerOnLevelConfigurationEntity(NumberConfigurationEntity): _attr_native_max_value: float = 255 _attribute_name = "on_intensity" _attr_translation_key: str = "on_level" + _cluster_id = SINOPE_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"sinope_manufacturer_specific"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({SINOPE_MANUFACTURER_CLUSTER}), models=frozenset({"DM2500ZB", "DM2500ZB-G2", "DM2550ZB", "DM2550ZB-G2"}), ) @@ -1255,9 +1612,10 @@ class SinopeLightLEDOnIntensityConfigurationEntity(NumberConfigurationEntity): _attr_native_max_value: float = 100 _attribute_name = "on_led_intensity" _attr_translation_key: str = "on_led_intensity" + _cluster_id = SINOPE_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"sinope_manufacturer_specific"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({SINOPE_MANUFACTURER_CLUSTER}), models=frozenset( { "DM2500ZB", @@ -1281,9 +1639,10 @@ class SinopeLightLEDOffIntensityConfigurationEntity(NumberConfigurationEntity): _attr_native_max_value: float = 100 _attribute_name = "off_led_intensity" _attr_translation_key: str = "off_led_intensity" + _cluster_id = SINOPE_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"sinope_manufacturer_specific"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({SINOPE_MANUFACTURER_CLUSTER}), models=frozenset( { "DM2500ZB", diff --git a/zha/application/platforms/select.py b/zha/application/platforms/select.py index 8bfbc2bbe..5b747391d 100644 --- a/zha/application/platforms/select.py +++ b/zha/application/platforms/select.py @@ -7,7 +7,7 @@ from enum import Enum import functools import logging -from typing import TYPE_CHECKING, Any +from typing import TYPE_CHECKING, Any, cast from zhaquirks.danfoss import thermostat as danfoss_thermostat from zhaquirks.quirk_ids import ( @@ -21,37 +21,45 @@ from zhaquirks.xiaomi.aqara.switch_acn047 import OppleCluster as T2RelayOppleCluster from zigpy import types from zigpy.quirks.v2 import ZCLEnumMetadata +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, +) from zigpy.zcl.clusters.general import LevelControl, OnOff from zigpy.zcl.clusters.hvac import Thermostat, UserInterface from zigpy.zcl.clusters.measurement import OccupancySensing -from zigpy.zcl.clusters.security import IasWd +from zigpy.zcl.clusters.security import ( + IasWd, + SirenLevel, + Strobe, + StrobeLevel, + WarningMode, +) from zha.application import Platform -from zha.application.const import Strobe +from zha.application.helpers import write_attributes_safe from zha.application.platforms import ( + AttrConfig, + BaseEntity, BaseEntityInfo, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, EntityCategory, PlatformEntity, register_entity, ) -from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent -from zha.zigbee.cluster_handlers.const import ( +from zha.application.platforms.const import ( AQARA_OPPLE_CLUSTER, - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_IAS_WD, - CLUSTER_HANDLER_INOVELLI, - CLUSTER_HANDLER_LEVEL, - CLUSTER_HANDLER_OCCUPANCY, - CLUSTER_HANDLER_ON_OFF, - CLUSTER_HANDLER_THERMOSTAT, INOVELLI_CLUSTER, SINOPE_MANUFACTURER_CLUSTER, TUYA_MANUFACTURER_CLUSTER, ) +from zha.application.platforms.siren import AdvancedSiren if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint @@ -66,8 +74,8 @@ class EnumSelectInfo(BaseEntityInfo): options: list[str] -class BaseSelectEntity(PlatformEntity, ABC): - """Abstract base class for ZHA select entities.""" +class BaseSelectEntity(BaseEntity, ABC): + """Abstract base class for select entities (platform-agnostic).""" PLATFORM = Platform.SELECT @@ -95,25 +103,31 @@ async def async_select_option(self, option: str) -> None: """Change the selected option.""" -class EnumSelectEntity(BaseSelectEntity): - """Representation of a ZHA select entity.""" +class SirenDefaultSelectEntity(BaseSelectEntity, PlatformEntity): + """Select entity whose state lives on the AdvancedSiren on the same cluster.""" _attr_entity_category = EntityCategory.CONFIG - _attribute_name: str _enum: type[Enum] + # Subclasses can override to pin specific option strings (e.g. to preserve + # legacy display names that differ from zigpy's enum member names). + _option_overrides: dict[str, Enum] | None = None def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Init this select entity.""" - self._cluster_handler: ClusterHandler = cluster_handlers[0] - self._attribute_name = self._enum.__name__ - self._attr_options = [entry.name.replace("_", " ") for entry in self._enum] - super().__init__(cluster_handlers, endpoint, device, **kwargs) + if self._option_overrides is not None: + self._option_to_member: dict[str, Enum] = self._option_overrides + else: + self._option_to_member = { + entry.name.replace("_", " "): entry for entry in self._enum + } + self._member_to_option = {m: o for o, m in self._option_to_member.items()} + self._attr_options = list(self._option_to_member) + super().__init__(endpoint=endpoint, device=device, **kwargs) @functools.cached_property def info_object(self) -> EnumSelectInfo: @@ -124,19 +138,32 @@ def info_object(self) -> EnumSelectInfo: options=self.options, ) + @property + def available(self) -> bool: + """Return entity availability.""" + return True + + def _siren(self) -> AdvancedSiren: + return cast( + AdvancedSiren, + self._device.get_entity( + Platform.SIREN, + endpoint_id=self._endpoint.id, + cluster_id=IasWd.cluster_id, + ), + ) + @property def current_option(self) -> str | None: """Return the selected entity option to represent the entity state.""" - option = self._cluster_handler.data_cache.get(self._attribute_name) - if option is None: + value = self._siren().defaults[self._enum] + if value is None: return None - return option.name.replace("_", " ") + return self._member_to_option[value] async def async_select_option(self, option: str) -> None: """Change the selected option.""" - self._cluster_handler.data_cache[self._attribute_name] = self._enum[ - option.replace(" ", "_") - ] + self._siren().defaults[self._enum] = self._option_to_member[option] self.maybe_emit_state_changed_event() def restore_external_state_attributes( @@ -145,76 +172,72 @@ def restore_external_state_attributes( state: str, ) -> None: """Restore extra state attributes that are stored outside of the ZCL cache.""" - value = state.replace(" ", "_") - self._cluster_handler.data_cache[self._attribute_name] = self._enum[value] - - -class NonZCLSelectEntity(EnumSelectEntity): - """Representation of a ZHA select entity with no ZCL interaction.""" - - @property - def available(self) -> bool: - """Return entity availability.""" - return True + self._siren().defaults[self._enum] = self._option_to_member[state] @register_entity(IasWd.cluster_id) -class DefaultToneSelectEntity(NonZCLSelectEntity): +class DefaultToneSelectEntity(SirenDefaultSelectEntity): """Representation of a ZHA default siren tone select entity.""" _unique_id_suffix = "WarningMode" - _enum = IasWd.Warning.WarningMode + _enum = WarningMode _attr_translation_key: str = "default_siren_tone" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_IAS_WD}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({IasWd.cluster_id}), not_exposed_features=frozenset({SIREN_BASIC}), ) @register_entity(IasWd.cluster_id) -class DefaultSirenLevelSelectEntity(NonZCLSelectEntity): +class DefaultSirenLevelSelectEntity(SirenDefaultSelectEntity): """Representation of a ZHA default siren level select entity.""" _unique_id_suffix = "SirenLevel" - _enum = IasWd.Warning.SirenLevel + _enum = SirenLevel _attr_translation_key: str = "default_siren_level" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_IAS_WD}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({IasWd.cluster_id}), not_exposed_features=frozenset({SIREN_BASIC}), ) @register_entity(IasWd.cluster_id) -class DefaultStrobeLevelSelectEntity(NonZCLSelectEntity): +class DefaultStrobeLevelSelectEntity(SirenDefaultSelectEntity): """Representation of a ZHA default siren strobe level select entity.""" _unique_id_suffix = "StrobeLevel" - _enum = IasWd.StrobeLevel + _enum = StrobeLevel _attr_translation_key: str = "default_strobe_level" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_IAS_WD}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({IasWd.cluster_id}), not_exposed_features=frozenset({SIREN_BASIC}), ) @register_entity(IasWd.cluster_id) -class DefaultStrobeSelectEntity(NonZCLSelectEntity): +class DefaultStrobeSelectEntity(SirenDefaultSelectEntity): """Representation of a ZHA default siren strobe select entity.""" _unique_id_suffix = "Strobe" _enum = Strobe _attr_translation_key: str = "default_strobe" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_IAS_WD}), + # Backwards-compat: this entity previously used a zha-local `Strobe` enum + # with members `No_Strobe`/`Strobe` displayed as "No Strobe"/"Strobe". + # zigpy's enum uses `No_strobe`, which would otherwise change the display + # to "No strobe". Pin the option strings here. + _option_overrides = {"No Strobe": Strobe.No_strobe, "Strobe": Strobe.Strobe} + + _cluster_match = ClusterMatch( + server_clusters=frozenset({IasWd.cluster_id}), not_exposed_features=frozenset({SIREN_BASIC}), ) -class ZCLEnumSelectEntity(BaseSelectEntity): +class ZCLEnumSelectEntity(BaseSelectEntity, PlatformEntity): """Representation of a ZHA ZCL enum select entity.""" _attribute_name: str @@ -223,33 +246,34 @@ class ZCLEnumSelectEntity(BaseSelectEntity): def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Init this select entity.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) - self._cluster_handler: ClusterHandler = cluster_handlers[0] + super().__init__(endpoint=endpoint, device=device, **kwargs) self._attr_options = [entry.name.replace("_", " ") for entry in self._enum] def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) def _is_supported(self) -> bool: if ( - self._attribute_name not in self._cluster_handler.cluster.attributes_by_name - or self._cluster_handler.cluster.is_attribute_unsupported( - self._attribute_name - ) - or self._cluster_handler.cluster.get(self._attribute_name) is None + self._attribute_name not in self._cluster.attributes_by_name + or self._cluster.is_attribute_unsupported(self._attribute_name) + or self._cluster.get(self._attribute_name) is None ): _LOGGER.debug( "%s is not supported - skipping %s entity creation", @@ -278,7 +302,7 @@ def info_object(self) -> EnumSelectInfo: @property def current_option(self) -> str | None: """Return the selected entity option to represent the entity state.""" - option = self._cluster_handler.cluster.get(self._attribute_name) + option = self._cluster.get(self._attribute_name) if option is None: return None option = self._enum(option) @@ -286,16 +310,20 @@ def current_option(self) -> str | None: async def async_select_option(self, option: str) -> None: """Change the selected option.""" - await self._cluster_handler.write_attributes_safe( - {self._attribute_name: self._enum[option.replace(" ", "_")]} + await write_attributes_safe( + self._cluster, + {self._attribute_name: self._enum[option.replace(" ", "_")]}, ) self.maybe_emit_state_changed_event() - def handle_cluster_handler_attribute_updated( + def handle_attribute_updated( self, - event: ClusterAttributeUpdatedEvent, # pylint: disable=unused-argument + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: - """Handle value update from cluster handler.""" + """Handle value update from cluster.""" if event.attribute_name == self._attribute_name: self.maybe_emit_state_changed_event() @@ -316,11 +344,29 @@ class StartupOnOffSelectEntity(ZCLEnumSelectEntity): _attribute_name = "start_up_on_off" _enum = OnOff.StartUpOnOff _attr_translation_key: str = "start_up_on_off" + _cluster_id = OnOff.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({OnOff.cluster_id}), ) + _server_cluster_config = { + OnOff.cluster_id: ClusterConfig( + bind=True, + attributes={ + OnOff.AttributeDefs.on_off: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + OnOff.AttributeDefs.start_up_on_off: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + class TuyaPowerOnState(types.enum8): """Tuya power on state enum.""" @@ -338,12 +384,21 @@ class TuyaPowerOnStateSelectEntity(ZCLEnumSelectEntity): _attribute_name = "power_on_state" _enum = TuyaPowerOnState _attr_translation_key: str = "power_on_state" + _cluster_id = OnOff.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OnOff.cluster_id}), exposed_features=frozenset({TUYA_PLUG_ONOFF}), ) + _server_cluster_config = { + OnOff.cluster_id: ClusterConfig( + attributes={ + "power_on_state": AttrConfig(read_on_startup=False), + }, + ), + } + @register_entity(TUYA_MANUFACTURER_CLUSTER) class TuyaManufacturerPowerOnStateSelectEntity(ZCLEnumSelectEntity): @@ -353,9 +408,10 @@ class TuyaManufacturerPowerOnStateSelectEntity(ZCLEnumSelectEntity): _attribute_name = "power_on_state" _enum = TuyaPowerOnState _attr_translation_key: str = "power_on_state" + _cluster_id = TUYA_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"tuya_manufacturer"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({TUYA_MANUFACTURER_CLUSTER}), exposed_features=frozenset({TUYA_PLUG_MANUFACTURER}), ) @@ -376,12 +432,21 @@ class TuyaBacklightModeSelectEntity(ZCLEnumSelectEntity): _attribute_name = "backlight_mode" _enum = TuyaBacklightMode _attr_translation_key: str = "backlight_mode" + _cluster_id = OnOff.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OnOff.cluster_id}), exposed_features=frozenset({TUYA_PLUG_ONOFF}), ) + _server_cluster_config = { + OnOff.cluster_id: ClusterConfig( + attributes={ + "backlight_mode": AttrConfig(read_on_startup=False), + }, + ), + } + class MoesBacklightMode(types.enum8): """MOES switch backlight mode enum.""" @@ -400,9 +465,10 @@ class MoesBacklightModeSelectEntity(ZCLEnumSelectEntity): _attribute_name = "backlight_mode" _enum = MoesBacklightMode _attr_translation_key: str = "backlight_mode" + _cluster_id = TUYA_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"tuya_manufacturer"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({TUYA_MANUFACTURER_CLUSTER}), exposed_features=frozenset({TUYA_PLUG_MANUFACTURER}), ) @@ -423,9 +489,10 @@ class AqaraMotionSensitivity(ZCLEnumSelectEntity): _attribute_name = "motion_sensitivity" _enum = AqaraMotionSensitivities _attr_translation_key: str = "motion_sensitivity" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.motion.ac01", "lumi.motion.ac02", "lumi.motion.agl04"}), ) @@ -446,13 +513,34 @@ class HueV1MotionSensitivity(ZCLEnumSelectEntity): _attribute_name = "sensitivity" _enum = HueV1MotionSensitivities _attr_translation_key: str = "motion_sensitivity" + _cluster_id = OccupancySensing.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_OCCUPANCY}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OccupancySensing.cluster_id}), manufacturers=frozenset({"Philips", "Signify Netherlands B.V."}), models=frozenset({"SML001"}), ) + _server_cluster_config = { + OccupancySensing.cluster_id: ClusterConfig( + bind=True, + attributes={ + OccupancySensing.AttributeDefs.occupancy: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + OccupancySensing.AttributeDefs.pir_o_to_u_delay: AttrConfig( + read_on_startup=False, + ), + OccupancySensing.AttributeDefs.pir_u_to_o_delay: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + class HueV2MotionSensitivities(types.enum8): """Hue v2 motion sensitivities.""" @@ -472,9 +560,10 @@ class HueV2MotionSensitivity(ZCLEnumSelectEntity): _attribute_name = "sensitivity" _enum = HueV2MotionSensitivities _attr_translation_key: str = "motion_sensitivity" + _cluster_id = OccupancySensing.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_OCCUPANCY}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OccupancySensing.cluster_id}), manufacturers=frozenset({"Philips", "Signify Netherlands B.V."}), models=frozenset({"SML002", "SML003", "SML004"}), ) @@ -495,9 +584,10 @@ class AqaraMonitoringMode(ZCLEnumSelectEntity): _attribute_name = "monitoring_mode" _enum = AqaraMonitoringModess _attr_translation_key: str = "monitoring_mode" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.motion.ac01"}), ) @@ -518,9 +608,10 @@ class AqaraApproachDistance(ZCLEnumSelectEntity): _attribute_name = "approach_distance" _enum = AqaraApproachDistances _attr_translation_key: str = "approach_distance" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.motion.ac01"}), ) @@ -533,9 +624,10 @@ class AqaraMagnetAC01DetectionDistance(ZCLEnumSelectEntity): _attribute_name = "detection_distance" _enum = MagnetAC01OppleCluster.DetectionDistance _attr_translation_key: str = "detection_distance" + _cluster_id = MagnetAC01OppleCluster.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({MagnetAC01OppleCluster.cluster_id}), models=frozenset({"lumi.magnet.ac01"}), ) @@ -548,9 +640,10 @@ class AqaraT2RelaySwitchMode(ZCLEnumSelectEntity): _attribute_name = "switch_mode" _enum = T2RelayOppleCluster.SwitchMode _attr_translation_key: str = "switch_mode" + _cluster_id = T2RelayOppleCluster.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({T2RelayOppleCluster.cluster_id}), models=frozenset({"lumi.switch.acn047"}), ) @@ -563,9 +656,10 @@ class AqaraT2RelaySwitchType(ZCLEnumSelectEntity): _attribute_name = "switch_type" _enum = T2RelayOppleCluster.SwitchType _attr_translation_key: str = "switch_type" + _cluster_id = T2RelayOppleCluster.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({T2RelayOppleCluster.cluster_id}), models=frozenset({"lumi.switch.acn047"}), ) @@ -578,9 +672,10 @@ class AqaraT2RelayStartupOnOff(ZCLEnumSelectEntity): _attribute_name = "startup_on_off" _enum = T2RelayOppleCluster.StartupOnOff _attr_translation_key: str = "start_up_on_off" + _cluster_id = T2RelayOppleCluster.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({T2RelayOppleCluster.cluster_id}), models=frozenset({"lumi.switch.acn047"}), ) @@ -593,9 +688,10 @@ class AqaraT2RelayDecoupledMode(ZCLEnumSelectEntity): _attribute_name = "decoupled_mode" _enum = T2RelayOppleCluster.DecoupledMode _attr_translation_key: str = "decoupled_mode" + _cluster_id = T2RelayOppleCluster.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({T2RelayOppleCluster.cluster_id}), models=frozenset({"lumi.switch.acn047"}), ) @@ -615,9 +711,10 @@ class InovelliOutputModeEntity(ZCLEnumSelectEntity): _attribute_name = "output_mode" _enum = InovelliOutputMode _attr_translation_key: str = "output_mode" + _cluster_id = INOVELLI_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -638,9 +735,10 @@ class InovelliSwitchTypeEntity(ZCLEnumSelectEntity): _attribute_name = "switch_type" _enum = InovelliSwitchType _attr_translation_key: str = "switch_type" + _cluster_id = INOVELLI_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), models=frozenset({"VZM31-SN"}), ) @@ -660,9 +758,10 @@ class InovelliFanSwitchTypeEntity(ZCLEnumSelectEntity): _attribute_name = "switch_type" _enum = InovelliFanSwitchType _attr_translation_key: str = "switch_type" + _cluster_id = INOVELLI_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), models=frozenset({"VZM35-SN"}), ) @@ -682,9 +781,10 @@ class InovelliLedScalingModeEntity(ZCLEnumSelectEntity): _attribute_name = "led_scaling_mode" _enum = InovelliLedScalingMode _attr_translation_key: str = "led_scaling_mode" + _cluster_id = INOVELLI_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -712,9 +812,10 @@ class InovelliFanLedScalingModeEntity(ZCLEnumSelectEntity): _attribute_name = "smart_fan_led_display_levels" _enum = InovelliFanLedScalingMode _attr_translation_key: str = "smart_fan_led_display_levels" + _cluster_id = INOVELLI_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), models=frozenset({"VZM35-SN"}), ) @@ -734,9 +835,10 @@ class InovelliNonNeutralOutputEntity(ZCLEnumSelectEntity): _attribute_name = "increased_non_neutral_output" _enum = InovelliNonNeutralOutput _attr_translation_key: str = "increased_non_neutral_output" + _cluster_id = INOVELLI_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -755,9 +857,10 @@ class InovelliDimmingModeEntity(ZCLEnumSelectEntity): _attribute_name = "leading_or_trailing_edge" _enum = InovelliDimmingMode _attr_translation_key: str = "leading_or_trailing_edge" + _cluster_id = INOVELLI_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), models=frozenset({"VZM31-SN", "VZM36"}), ) @@ -777,9 +880,10 @@ class AqaraPetFeederMode(ZCLEnumSelectEntity): _attribute_name = "feeding_mode" _enum = AqaraFeedingMode _attr_translation_key: str = "feeding_mode" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"aqara.feeder.acn001"}), ) @@ -800,9 +904,10 @@ class AqaraThermostatPreset(ZCLEnumSelectEntity): _attribute_name = "preset" _enum = AqaraThermostatPresetMode _attr_translation_key: str = "preset" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.airrtc.agl001"}), ) @@ -823,9 +928,10 @@ class SonoffPresenceDetectionSensitivity(ZCLEnumSelectEntity): _attribute_name = "ultrasonic_u_to_o_threshold" _enum = SonoffPresenceDetectionSensitivityEnum _attr_translation_key: str = "detection_sensitivity" + _cluster_id = OccupancySensing.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_OCCUPANCY}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OccupancySensing.cluster_id}), models=frozenset({"SNZB-06P", "SNZB-03P"}), ) @@ -852,11 +958,23 @@ class KeypadLockout(ZCLEnumSelectEntity): _attribute_name: str = "keypad_lockout" _enum = KeypadLockoutEnum _attr_translation_key: str = "keypad_lockout" + _cluster_id = UserInterface.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"thermostat_ui"}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({UserInterface.cluster_id}), ) + _server_cluster_config = { + UserInterface.cluster_id: ClusterConfig( + bind=True, + attributes={ + UserInterface.AttributeDefs.keypad_lockout: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossExerciseDayOfTheWeek(ZCLEnumSelectEntity): @@ -866,12 +984,123 @@ class DanfossExerciseDayOfTheWeek(ZCLEnumSelectEntity): _attribute_name = "exercise_day_of_week" _attr_translation_key: str = "exercise_day_of_week" _enum = danfoss_thermostat.DanfossExerciseDayOfTheWeekEnum + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + Thermostat.AttributeDefs.local_temperature: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.occupied_cooling_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.occupied_heating_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.unoccupied_cooling_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.unoccupied_heating_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.running_mode: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.running_state: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.system_mode: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.occupancy: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.pi_cooling_demand: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=5 + ), + ), + Thermostat.AttributeDefs.pi_heating_demand: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=5 + ), + ), + Thermostat.AttributeDefs.abs_min_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.abs_max_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.abs_min_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.abs_max_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.ctrl_sequence_of_oper: AttrConfig( + read_on_startup=True, + ), + Thermostat.AttributeDefs.max_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.max_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.min_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.min_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.local_temperature_calibration: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.setpoint_change_source: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.setpoint_change_source_timestamp: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + class DanfossOrientationEnum(types.enum8): """Vertical or Horizontal.""" @@ -892,9 +1121,10 @@ class DanfossOrientation(ZCLEnumSelectEntity): _attribute_name = "orientation" _attr_translation_key: str = "valve_orientation" _enum = DanfossOrientationEnum + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) @@ -907,9 +1137,10 @@ class DanfossAdaptationRunControl(ZCLEnumSelectEntity): _attribute_name = "adaptation_run_control" _attr_translation_key: str = "adaptation_run_command" _enum = danfoss_thermostat.DanfossAdaptationRunControlEnum + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) @@ -947,9 +1178,10 @@ class DanfossControlAlgorithmScaleFactor(ZCLEnumSelectEntity): _attribute_name = "control_algorithm_scale_factor" _attr_translation_key: str = "setpoint_response_time" _enum = DanfossControlAlgorithmScaleFactorEnum + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) @@ -962,12 +1194,22 @@ class DanfossViewingDirection(ZCLEnumSelectEntity): _attribute_name = "viewing_direction" _attr_translation_key: str = "viewing_direction" _enum = danfoss_thermostat.DanfossViewingDirectionEnum + _cluster_id = UserInterface.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"thermostat_ui"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({UserInterface.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + UserInterface.cluster_id: ClusterConfig( + bind=True, + attributes={ + "viewing_direction": AttrConfig(read_on_startup=True), + }, + ), + } + class SinopeLightLedColors(types.enum32): """Color values for Sinope light switch status LEDs.""" @@ -999,9 +1241,10 @@ class SinopeLightLEDOffColorSelect(ZCLEnumSelectEntity): _attribute_name = "off_led_color" _attr_translation_key: str = "off_led_color" _enum = SinopeLightLedColors + _cluster_id = SINOPE_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"sinope_manufacturer_specific"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({SINOPE_MANUFACTURER_CLUSTER}), models=SINOPE_MODELS, ) @@ -1014,9 +1257,10 @@ class SinopeLightLEDOnColorSelect(ZCLEnumSelectEntity): _attribute_name = "on_led_color" _attr_translation_key: str = "on_led_color" _enum = SinopeLightLedColors + _cluster_id = SINOPE_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"sinope_manufacturer_specific"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({SINOPE_MANUFACTURER_CLUSTER}), models=SINOPE_MODELS, ) @@ -1036,17 +1280,52 @@ class BegaColorTemperatureChannelSelect(ZCLEnumSelectEntity): _attribute_name = "switchable_white" _enum = BegaColorTemperatureChannel _attr_translation_key: str = "color_temperature_channel" + _cluster_id = LevelControl.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_LEVEL}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({LevelControl.cluster_id}), exposed_features=frozenset({BEGA_LIGHT_SWITCHABLE_WHITE}), ) + _server_cluster_config = { + LevelControl.cluster_id: ClusterConfig( + bind=True, + attributes={ + LevelControl.AttributeDefs.current_level: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=1, max_interval=900, reportable_change=1 + ), + ), + LevelControl.AttributeDefs.on_off_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.on_level: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.on_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.off_transition_time: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.default_move_rate: AttrConfig( + read_on_startup=False, + ), + LevelControl.AttributeDefs.start_up_current_level: AttrConfig( + read_on_startup=False, + ), + "switchable_white": AttrConfig(read_on_startup=False), + "switchable_color_temperature_1": AttrConfig(read_on_startup=False), + "switchable_color_temperature_2": AttrConfig(read_on_startup=False), + }, + ), + } + def _is_supported(self) -> bool: """Check if the light supports switchable color temperatures.""" - cluster = self._cluster_handler.cluster - temp_1 = cluster.get("switchable_color_temperature_1") - temp_2 = cluster.get("switchable_color_temperature_2") + temp_1 = self._cluster.get("switchable_color_temperature_1") + temp_2 = self._cluster.get("switchable_color_temperature_2") if temp_1 == 0xFFFF or temp_2 == 0xFFFF: _LOGGER.debug( diff --git a/zha/application/platforms/sensor/__init__.py b/zha/application/platforms/sensor/__init__.py index 4b3cb0079..b6f415184 100644 --- a/zha/application/platforms/sensor/__init__.py +++ b/zha/application/platforms/sensor/__init__.py @@ -3,7 +3,6 @@ from __future__ import annotations from abc import ABC, abstractmethod -from asyncio import Task import contextlib from dataclasses import dataclass from datetime import date, datetime, timedelta @@ -20,7 +19,14 @@ from zigpy import types from zigpy.quirks.v2 import ZCLEnumMetadata, ZCLSensorMetadata from zigpy.state import Counter, State -from zigpy.zcl import foundation +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, + foundation, +) from zigpy.zcl.clusters.closures import WindowCovering from zigpy.zcl.clusters.general import ( AnalogInput, @@ -28,6 +34,7 @@ DeviceTemperature as DeviceTemperatureCluster, PowerConfiguration, ) +from zigpy.zcl.clusters.general_const import ApplicationType from zigpy.zcl.clusters.homeautomation import Diagnostic, ElectricalMeasurement from zigpy.zcl.clusters.hvac import Thermostat from zigpy.zcl.clusters.measurement import ( @@ -52,30 +59,54 @@ ) from zha.application import Platform +from zha.application.helpers import safe_read from zha.application.platforms import ( + AttrConfig, BaseEntity, BaseEntityInfo, BaseIdentifiers, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, EntityCategory, PlatformEntity, PlatformFeatureGroup, register_entity, ) from zha.application.platforms.climate.const import HVACAction +from zha.application.platforms.const import ( + AQARA_OPPLE_CLUSTER, + IKEA_AIR_PURIFIER_CLUSTER, + INOVELLI_CLUSTER, + SMARTTHINGS_HUMIDITY_CLUSTER, + SONOFF_CLUSTER, + TUYA_MANUFACTURER_CLUSTER, + VOC_LEVEL_CLUSTER, +) from zha.application.platforms.helpers import validate_device_class from zha.application.platforms.number.bacnet import BACNET_UNITS_TO_HA_UNITS from zha.application.platforms.sensor.const import ( ANALOG_INPUT_APPTYPE_DEV_CLASS, ANALOG_INPUT_APPTYPE_UNITS, + LEGACY_MEASUREMENT_TYPE_REMAPPING, + METERING_DEVICE_TYPES_ELECTRIC, + METERING_DEVICE_TYPES_GAS, + METERING_DEVICE_TYPES_HEATING_COOLING, + METERING_DEVICE_TYPES_WATER, ZCL_EPOCH, + DeviceStatusDefault, + DeviceStatusElectric, + DeviceStatusGas, + DeviceStatusHeatingCooling, + DeviceStatusWater, SensorDeviceClass, SensorStateClass, + metering_device_type_name, ) from zha.application.platforms.sensor.helpers import ( create_number_formatter, resolution_to_decimal_precision, ) +from zha.application.platforms.virtual import VirtualEntity from zha.decorators import periodic from zha.units import ( CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, @@ -99,38 +130,8 @@ UnitOfVolume, UnitOfVolumeFlowRate, ) -from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent -from zha.zigbee.cluster_handlers.const import ( - AQARA_OPPLE_CLUSTER, - CLUSTER_HANDLER_ANALOG_INPUT, - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_BASIC, - CLUSTER_HANDLER_COVER, - CLUSTER_HANDLER_DEVICE_TEMPERATURE, - CLUSTER_HANDLER_DIAGNOSTIC, - CLUSTER_HANDLER_ELECTRICAL_CONDUCTIVITY, - CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT, - CLUSTER_HANDLER_FLOW, - CLUSTER_HANDLER_HUMIDITY, - CLUSTER_HANDLER_ILLUMINANCE, - CLUSTER_HANDLER_INOVELLI, - CLUSTER_HANDLER_LEAF_WETNESS, - CLUSTER_HANDLER_POWER_CONFIGURATION, - CLUSTER_HANDLER_PRESSURE, - CLUSTER_HANDLER_SMARTENERGY_METERING, - CLUSTER_HANDLER_SOIL_MOISTURE, - CLUSTER_HANDLER_TEMPERATURE, - CLUSTER_HANDLER_THERMOSTAT, - CLUSTER_HANDLER_WIND_SPEED, - IKEA_AIR_PURIFIER_CLUSTER, - INOVELLI_CLUSTER, - SMARTTHINGS_HUMIDITY_CLUSTER, - SONOFF_CLUSTER, - TUYA_MANUFACTURER_CLUSTER, -) if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint @@ -242,43 +243,42 @@ class Sensor(BaseSensor): def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Init this sensor.""" - self._cluster_handler: ClusterHandler = cluster_handlers[0] self._attr_def: foundation.ZCLAttributeDef | None = None - super().__init__(cluster_handlers, endpoint, device, **kwargs) + super().__init__(endpoint=endpoint, device=device, **kwargs) # After super() for quirks v2 entities if self._attribute_name is not None: # Invalid attribute names filtered by is_supported with contextlib.suppress(KeyError): - self._attr_def = self._cluster_handler.cluster.find_attribute( - self._attribute_name - ) + self._attr_def = self._cluster.find_attribute(self._attribute_name) self.recompute_capabilities() def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) def _is_supported(self) -> bool: if ( - self._attribute_name not in self._cluster_handler.cluster.attributes_by_name - ) or self._cluster_handler.cluster.is_attribute_unsupported( - self._attribute_name - ): + self._attribute_name not in self._cluster.attributes_by_name + ) or self._cluster.is_attribute_unsupported(self._attribute_name): _LOGGER.debug( "%s is not supported - skipping %s entity creation", self._attribute_name, @@ -288,7 +288,7 @@ def _is_supported(self) -> bool: if ( self._skip_creation_if_no_attr_cache - and self._cluster_handler.cluster.get(self._attribute_name) is None + and self._cluster.get(self._attribute_name) is None ): return False @@ -337,7 +337,7 @@ def _init_from_quirks_metadata(self, entity_metadata: ZCLSensorMetadata) -> None def native_value(self) -> date | datetime | str | int | float | None: """Return the state of the entity.""" assert self._attribute_name is not None - raw_state = self._cluster_handler.cluster.get(self._attribute_name) + raw_state = self._cluster.get(self._attribute_name) if raw_state is None: return None if self._is_non_value(raw_state): @@ -346,11 +346,14 @@ def native_value(self) -> date | datetime | str | int | float | None: return self._attribute_converter(raw_state) return self.formatter(raw_state) - def handle_cluster_handler_attribute_updated( + def handle_attribute_updated( self, - event: ClusterAttributeUpdatedEvent, # pylint: disable=unused-argument + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: - """Handle attribute updates from the cluster handler.""" + """Handle attribute updates from the cluster.""" if ( event.attribute_name == self._attribute_name or ( @@ -386,82 +389,24 @@ def formatter(self, value: Any) -> date | datetime | int | float | str | None: return value + async def async_update(self) -> None: + """Retrieve latest state.""" + if self._attribute_name is None: + return + self.debug("polling current state") + await safe_read( + self._cluster, + [self._attribute_name], + allow_cache=False, + only_cache=False, + ) + self.maybe_emit_state_changed_event() + class TimestampSensor(Sensor): """Timestamp ZHA sensor.""" -class PollableSensor(Sensor): - """Base ZHA sensor that polls for state.""" - - _REFRESH_INTERVAL = (30, 45) - _use_custom_polling: bool = True - __polling_interval: int - - def __init__( - self, - cluster_handlers: list[ClusterHandler], - endpoint: Endpoint, - device: Device, - **kwargs: Any, - ) -> None: - """Init this sensor.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) - self._polling_task: Task | None = None - - def on_add(self) -> None: - """Run when entity is added.""" - super().on_add() - self.maybe_start_polling() - - @property - def should_poll(self) -> bool: - """Return True if we need to poll for state changes.""" - return self._use_custom_polling - - def maybe_start_polling(self) -> None: - """Start polling if necessary.""" - if self.should_poll: - self._polling_task = self.device.gateway.async_create_background_task( - self._refresh(), - name=f"sensor_state_poller_{self.unique_id}_{self.__class__.__name__}", - eager_start=True, - untracked=True, - ) - self._tracked_tasks.append(self._polling_task) - self.debug( - "started polling with refresh interval of %s", - getattr(self, "__polling_interval"), - ) - - def enable(self) -> None: - """Enable the entity.""" - super().enable() - self.maybe_start_polling() - - def disable(self) -> None: - """Disable the entity.""" - super().disable() - if self._polling_task: - self._tracked_tasks.remove(self._polling_task) - self._polling_task.cancel() - self._polling_task = None - - @periodic(_REFRESH_INTERVAL) - async def _refresh(self): - """Call async_update at a constrained random interval.""" - if self.device.available and self.device.gateway.config.allow_polling: - self.debug("polling for updated state") - await self.async_update() - self.maybe_emit_state_changed_event() - else: - self.debug( - "skipping polling for updated state, available: %s, allow polled requests: %s", - self.device.available, - self.device.gateway.config.allow_polling, - ) - - class DeviceCounterSensor(BaseEntity): """Device counter sensor.""" @@ -584,13 +529,12 @@ class EnumSensor(Sensor): def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Init this sensor.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) + super().__init__(endpoint=endpoint, device=device, **kwargs) self._attr_options = [e.name for e in self._enum] # XXX: This class is not meant to be initialized directly, as `unique_id` @@ -615,12 +559,54 @@ class DigiAnalogInput(Sensor): _attribute_name = "present_value" _attr_translation_key: str = "analog_input" + _cluster_id = AnalogInput.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ANALOG_INPUT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AnalogInput.cluster_id}), manufacturers=frozenset({"Digi"}), ) + _server_cluster_config = { + AnalogInput.cluster_id: ClusterConfig( + bind=True, + attributes={ + AnalogInput.AttributeDefs.present_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + AnalogInput.AttributeDefs.description: AttrConfig( + read_on_startup=False, + ), + AnalogInput.AttributeDefs.max_present_value: AttrConfig( + read_on_startup=False, + ), + AnalogInput.AttributeDefs.min_present_value: AttrConfig( + read_on_startup=False, + ), + AnalogInput.AttributeDefs.out_of_service: AttrConfig( + read_on_startup=False, + ), + AnalogInput.AttributeDefs.reliability: AttrConfig( + read_on_startup=False, + ), + AnalogInput.AttributeDefs.resolution: AttrConfig( + read_on_startup=False, + ), + AnalogInput.AttributeDefs.status_flags: AttrConfig( + read_on_startup=False, + ), + AnalogInput.AttributeDefs.engineering_units: AttrConfig( + read_on_startup=False, + ), + AnalogInput.AttributeDefs.application_type: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + @register_entity(AnalogInput.cluster_id) class AnalogInputSensor(Sensor): @@ -629,21 +615,71 @@ class AnalogInputSensor(Sensor): _attribute_name = "present_value" _unique_id_suffix = "analog_input" _attr_state_class = SensorStateClass.MEASUREMENT + _cluster_id = AnalogInput.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AnalogInput.cluster_id}), + ) + + _server_cluster_config = { + AnalogInput.cluster_id: ClusterConfig( + bind=True, + attributes={ + AnalogInput.AttributeDefs.present_value: AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + AnalogInput.AttributeDefs.description: AttrConfig( + read_on_startup=False + ), + AnalogInput.AttributeDefs.max_present_value: AttrConfig( + read_on_startup=False + ), + AnalogInput.AttributeDefs.min_present_value: AttrConfig( + read_on_startup=False + ), + AnalogInput.AttributeDefs.out_of_service: AttrConfig( + read_on_startup=False + ), + AnalogInput.AttributeDefs.reliability: AttrConfig( + read_on_startup=False + ), + AnalogInput.AttributeDefs.resolution: AttrConfig(read_on_startup=False), + AnalogInput.AttributeDefs.status_flags: AttrConfig( + read_on_startup=False + ), + AnalogInput.AttributeDefs.engineering_units: AttrConfig( + read_on_startup=False + ), + AnalogInput.AttributeDefs.application_type: AttrConfig( + read_on_startup=False + ), + }, + ), + } - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ANALOG_INPUT}), - ) + def _application_type(self): + """Return the AnalogInput application_type as an ApplicationType type.""" + result = self._cluster.get(AnalogInput.AttributeDefs.application_type.name) + if result is None: + return None + return ApplicationType.deserialize(types.uint32_t(result).serialize())[0] def recompute_capabilities(self) -> None: """Recompute capabilities.""" super().recompute_capabilities() - self._attr_fallback_name = self._cluster_handler.description + self._attr_fallback_name = self._cluster.get( + AnalogInput.AttributeDefs.description.name + ) - if self._cluster_handler.application_type is not None: + application_type = self._application_type() + if application_type is not None: # The application type encodes a tiny bit more info but it's mostly # irrelevant, just use the `type` sub-field - app_type = self._cluster_handler.application_type.type + app_type = application_type.type self._attr_device_class = ANALOG_INPUT_APPTYPE_DEV_CLASS.get(app_type) # Application type units take precedence @@ -652,24 +688,26 @@ def recompute_capabilities(self) -> None: ) else: self._attr_native_unit_of_measurement = BACNET_UNITS_TO_HA_UNITS.get( - self._cluster_handler.engineering_units + self._cluster.get(AnalogInput.AttributeDefs.engineering_units.name) ) # Resolution indicates the minimum change in value that can be detected - if self._cluster_handler.resolution is not None: + resolution = self._cluster.get(AnalogInput.AttributeDefs.resolution.name) + if resolution is not None: self._attr_suggested_display_precision = resolution_to_decimal_precision( - self._cluster_handler.resolution + resolution ) def _is_supported(self) -> bool: """Return True if this sensor is supported.""" - if self._cluster_handler.description is None: + if self._cluster.get(AnalogInput.AttributeDefs.description.name) is None: return False # The units are determined by one of these if ( - self._cluster_handler.application_type is None - and self._cluster_handler.engineering_units is None + self._application_type() is None + and self._cluster.get(AnalogInput.AttributeDefs.engineering_units.name) + is None ): return False @@ -691,10 +729,37 @@ class Battery(Sensor): "battery_quantity", "battery_voltage", } - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_POWER_CONFIGURATION}), - ) + _cluster_id = PowerConfiguration.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({PowerConfiguration.cluster_id}), + ) + + _server_cluster_config = { + PowerConfiguration.cluster_id: ClusterConfig( + bind=True, + attributes={ + PowerConfiguration.AttributeDefs.battery_voltage: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=3600, max_interval=10800, reportable_change=1 + ), + ), + PowerConfiguration.AttributeDefs.battery_percentage_remaining: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=3600, max_interval=10800, reportable_change=1 + ), + ), + PowerConfiguration.AttributeDefs.battery_size: AttrConfig( + read_on_startup=False, + ), + PowerConfiguration.AttributeDefs.battery_quantity: AttrConfig( + read_on_startup=False, + ), + }, + ), + } def _is_supported(self) -> bool: # XXX: We intentionally ignore the presence of this attribute @@ -712,52 +777,69 @@ def formatter(value: int) -> float | None: # pylint: disable=arguments-differ def state(self) -> dict[str, Any]: """Return the state for battery sensors.""" response = super().state - battery_size = self._cluster_handler.cluster.get("battery_size") + battery_size = self._cluster.get("battery_size") if battery_size is not None: response["battery_size"] = BATTERY_SIZES.get(battery_size, "Unknown") - battery_quantity = self._cluster_handler.cluster.get("battery_quantity") + battery_quantity = self._cluster.get("battery_quantity") if battery_quantity is not None: response["battery_quantity"] = battery_quantity - battery_voltage = self._cluster_handler.cluster.get("battery_voltage") + battery_voltage = self._cluster.get("battery_voltage") if battery_voltage is not None: response["battery_voltage"] = round(battery_voltage / 10, 2) return response -class BaseElectricalMeasurement(PollableSensor): +class BaseElectricalMeasurement(Sensor): """Base class for electrical measurement.""" - _use_custom_polling: bool = False - _attr_suggested_display_precision = 1 - _attr_max_attribute_name: str | None = None - _divisor_attribute_name: str | None = None - _multiplier_attribute_name: str | None = None - _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _attr_max_attribute_name: str | None + _multiplier_attribute_name: str | None + _multiplier_fallback_attribute_name: str | None + _divisor_attribute_name: str | None + _divisor_fallback_attribute_name: str | None def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Init this sensor.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) + super().__init__(endpoint=endpoint, device=device, **kwargs) self._attr_extra_state_attribute_names: set[str] = {"measurement_type"} if self._attr_max_attribute_name is not None: self._attr_extra_state_attribute_names.add(self._attr_max_attribute_name) + @property + def _measurement_type(self) -> str | None: + """Decode the measurement_type bitmap into a human-readable string.""" + meas_type = self._cluster.get( + ElectricalMeasurement.AttributeDefs.measurement_type.name + ) + if meas_type is None: + return None + + # Iterating over the bits only yields named bits so the earlier version of this + # code omitted any measurement types that were not explicitly in the bitmap type. + # TODO: deprecate this + return ", ".join( + LEGACY_MEASUREMENT_TYPE_REMAPPING[m] + for m in ElectricalMeasurement.MeasurementType(meas_type) + if m in LEGACY_MEASUREMENT_TYPE_REMAPPING + ) + @property def state(self) -> dict[str, Any]: """Return the state for this sensor.""" response = super().state - if self._cluster_handler.measurement_type is not None: - response["measurement_type"] = self._cluster_handler.measurement_type + meas_type = self._measurement_type + if meas_type is not None: + response["measurement_type"] = meas_type if (max_attr_name := self._attr_max_attribute_name) is None: return response - if (max_v := self._cluster_handler.cluster.get(max_attr_name)) is not None: + if (max_v := self._cluster.get(max_attr_name)) is not None: response[max_attr_name] = self.formatter(max_v) return response @@ -767,7 +849,10 @@ def _multiplier(self) -> int | float | None: if not self._multiplier_attribute_name: return super()._multiplier - return getattr(self._cluster_handler, self._multiplier_attribute_name) + value = self._cluster.get(self._multiplier_attribute_name) + if value is None and self._multiplier_fallback_attribute_name: + value = self._cluster.get(self._multiplier_fallback_attribute_name) + return value or 1 @_multiplier.setter def _multiplier(self, value: int | float | None) -> None: @@ -778,116 +863,374 @@ def _divisor(self) -> int | float | None: if not self._divisor_attribute_name: return super()._divisor - return getattr(self._cluster_handler, self._divisor_attribute_name) + value = self._cluster.get(self._divisor_attribute_name) + if value is None and self._divisor_fallback_attribute_name: + value = self._cluster.get(self._divisor_fallback_attribute_name) + return value or 1 @_divisor.setter def _divisor(self, value: int | float | None) -> None: raise AttributeError("Cannot set divisor directly") -# this entity will be created by ReportingEM or PolledEM class below -class ElectricalMeasurementActivePower(BaseElectricalMeasurement): - """Active power phase measurement.""" +class AggregatedClusterPoller(VirtualEntity): + """Polls a cluster on behalf of sibling entities that need updates. - _attribute_name = "active_power" - # no unique id suffix for backwards compatibility - # no translation key due to device class - _attr_max_attribute_name = "active_power_max" - _divisor_attribute_name = "ac_power_divisor" - _multiplier_attribute_name = "ac_power_multiplier" - _attr_device_class: SensorDeviceClass = SensorDeviceClass.POWER - _attr_native_unit_of_measurement: str = UnitOfPower.WATT + Builds the polling list dynamically from the cluster configs of enabled + sibling entities sharing this cluster — so disabling an entity in HA + drops its attributes from the poll on the next cycle. + """ + _cluster_id: int + _REFRESH_INTERVAL = (30, 45) -@register_entity(ElectricalMeasurement.cluster_id) -class ReportingElectricalMeasurement(ElectricalMeasurementActivePower): - """Unpolled active power measurement.""" + def on_add(self) -> None: + """Start the periodic polling task.""" + super().on_add() + task = self.device.gateway.async_create_background_task( + self._refresh(), + name=f"cluster_poller_{self.unique_id}", + eager_start=True, + untracked=True, + ) + self._tracked_tasks.append(task) - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - models=frozenset({"VZM31-SN", "SP 234", "outletv4", "INSPELNING Smart plug"}), - feature_priority=(PlatformFeatureGroup.EM_ACTIVE_POWER, 1), - ) + @periodic(_REFRESH_INTERVAL) + async def _refresh(self) -> None: + if not (self.device.available and self.device.gateway.config.allow_polling): + return + await self.async_update() + + async def async_update(self) -> None: + """Poll the union of attrs read by enabled sibling entities.""" + attrs: set[str] = set() + for entity in self.device.platform_entities.values(): + if entity is self or not isinstance(entity, Sensor): + continue + if entity._cluster is not self._cluster: + continue + if not entity.enabled: + continue + if entity._attribute_name and self._cluster.is_attribute_unsupported( + entity._attribute_name + ): + continue + cfg = entity._server_cluster_config.get(self._cluster_id) + if cfg is None: + continue + for attr_def, attr_cfg in cfg.attributes.items(): + if attr_cfg.reporting is None: + continue + if self._cluster.is_attribute_unsupported(attr_def): + continue + + attrs.add(attr_def if isinstance(attr_def, str) else attr_def.name) + + if not attrs: + return + + self.debug("polling %d attrs: %s", len(attrs), sorted(attrs)) + await safe_read( + self._cluster, sorted(attrs), allow_cache=False, only_cache=False + ) @register_entity(ElectricalMeasurement.cluster_id) -class PolledElectricalMeasurement(ElectricalMeasurementActivePower): - """Polled active power measurement that polls all relevant EM attributes.""" - - _use_custom_polling: bool = True +class ElectricalMeasurementPoller(AggregatedClusterPoller): + """Polls the EM cluster on behalf of sibling entities that need updates.""" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - feature_priority=(PlatformFeatureGroup.EM_ACTIVE_POWER, 0), + _unique_id_suffix = "em_poller" + _cluster_id = ElectricalMeasurement.cluster_id + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + feature_priority=(PlatformFeatureGroup.EM_POLLING, 0), ) @register_entity(ElectricalMeasurement.cluster_id) -class UbisysPolledElectricalMeasurement(PolledElectricalMeasurement): - """Polled active power for ubisys that keeps polling even when disabled. +class ElectricalMeasurementReportingDevice(VirtualEntity): + """Claims the EM polling slot for devices that support reporting. - ubisys devices disable the active power entity by default via a quirk, but - this entity still needs to poll the EM cluster so that other EM entities - (voltage, current, power factor) receive updated values. + Higher priority than the default `ElectricalMeasurementPoller`, so for + matching models the poller is not registered and no polling occurs. """ - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - manufacturers=frozenset({"ubisys"}), - feature_priority=(PlatformFeatureGroup.EM_ACTIVE_POWER, 1), + _unique_id_suffix = "em_reporting_device" + _cluster_id = ElectricalMeasurement.cluster_id + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + models=frozenset({"VZM31-SN", "SP 234", "outletv4", "INSPELNING Smart plug"}), + feature_priority=(PlatformFeatureGroup.EM_POLLING, 1), ) - def disable(self) -> None: - """Disable the entity but keep polling for EM cluster updates.""" - PlatformEntity.disable(self) - def enable(self) -> None: - """Enable the entity without starting a duplicate polling task.""" - PlatformEntity.enable(self) +@register_entity(ElectricalMeasurement.cluster_id) +class ElectricalMeasurementActivePower(BaseElectricalMeasurement): + """Active power measurement.""" + + _attribute_name = "active_power" + _attr_max_attribute_name = "active_power_max" + _divisor_attribute_name = "ac_power_divisor" + _divisor_fallback_attribute_name = "power_divisor" + _multiplier_attribute_name = "ac_power_multiplier" + _multiplier_fallback_attribute_name = "power_multiplier" + _attr_device_class: SensorDeviceClass = SensorDeviceClass.POWER + _attr_native_unit_of_measurement: str = UnitOfPower.WATT + _attr_suggested_display_precision = 1 + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_power_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_power_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.active_power: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.active_power_max: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) -class ElectricalMeasurementActivePowerPhB(ElectricalMeasurementActivePower): +class ElectricalMeasurementActivePowerPhB(BaseElectricalMeasurement): """Active power phase B measurement.""" _attribute_name = "active_power_ph_b" _unique_id_suffix = "active_power_ph_b" _attr_translation_key: str = "active_power_ph_b" _attr_max_attribute_name = "active_power_max_ph_b" + _divisor_attribute_name = "ac_power_divisor" + _divisor_fallback_attribute_name = "power_divisor" + _multiplier_attribute_name = "ac_power_multiplier" + _multiplier_fallback_attribute_name = "power_multiplier" + _attr_device_class: SensorDeviceClass = SensorDeviceClass.POWER + _attr_native_unit_of_measurement: str = UnitOfPower.WATT + _attr_suggested_display_precision = 1 + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_power_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_power_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.active_power_ph_b: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.active_power_max_ph_b: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) -class ElectricalMeasurementActivePowerPhC(ElectricalMeasurementActivePower): +class ElectricalMeasurementActivePowerPhC(BaseElectricalMeasurement): """Active power phase C measurement.""" _attribute_name = "active_power_ph_c" _unique_id_suffix = "active_power_ph_c" _attr_translation_key: str = "active_power_ph_c" _attr_max_attribute_name = "active_power_max_ph_c" + _divisor_attribute_name = "ac_power_divisor" + _divisor_fallback_attribute_name = "power_divisor" + _multiplier_attribute_name = "ac_power_multiplier" + _multiplier_fallback_attribute_name = "power_multiplier" + _attr_device_class: SensorDeviceClass = SensorDeviceClass.POWER + _attr_native_unit_of_measurement: str = UnitOfPower.WATT + _attr_suggested_display_precision = 1 + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_power_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_power_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.active_power_ph_c: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.active_power_max_ph_c: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) -class ElectricalMeasurementTotalActivePower(ElectricalMeasurementActivePower): +class ElectricalMeasurementTotalActivePower(BaseElectricalMeasurement): """Total active power measurement.""" _attribute_name = "total_active_power" _unique_id_suffix = "total_active_power" _attr_translation_key: str = "total_active_power" + _attr_max_attribute_name = "active_power_max" + _divisor_attribute_name = "ac_power_divisor" + _divisor_fallback_attribute_name = "power_divisor" + _multiplier_attribute_name = "ac_power_multiplier" + _multiplier_fallback_attribute_name = "power_multiplier" + _attr_device_class: SensorDeviceClass = SensorDeviceClass.POWER + _attr_native_unit_of_measurement: str = UnitOfPower.WATT + _attr_suggested_display_precision = 1 + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_power_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_power_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.total_active_power: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.active_power_max: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -896,14 +1239,61 @@ class ElectricalMeasurementApparentPower(BaseElectricalMeasurement): _attribute_name = "apparent_power" _unique_id_suffix = "apparent_power" + _attr_max_attribute_name = None _divisor_attribute_name = "ac_power_divisor" + _divisor_fallback_attribute_name = "power_divisor" _multiplier_attribute_name = "ac_power_multiplier" + _multiplier_fallback_attribute_name = "power_multiplier" _attr_device_class: SensorDeviceClass = SensorDeviceClass.APPARENT_POWER _attr_native_unit_of_measurement = UnitOfApparentPower.VOLT_AMPERE - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _attr_suggested_display_precision = 1 + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_power_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_power_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.apparent_power: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -915,13 +1305,49 @@ class ElectricalMeasurementRMSCurrent(BaseElectricalMeasurement): _unique_id_suffix = "rms_current" _attr_max_attribute_name = "rms_current_max" _divisor_attribute_name = "ac_current_divisor" + _divisor_fallback_attribute_name = None _multiplier_attribute_name = "ac_current_multiplier" + _multiplier_fallback_attribute_name = None _attr_device_class: SensorDeviceClass = SensorDeviceClass.CURRENT _attr_native_unit_of_measurement = UnitOfElectricCurrent.AMPERE - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_current_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_current_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_current: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_current_max: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -934,9 +1360,41 @@ class ElectricalMeasurementRMSCurrentPhB(ElectricalMeasurementRMSCurrent): _attr_max_attribute_name: str = "rms_current_max_ph_b" _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_current_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_current_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_current_ph_b: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_current_max_ph_b: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -949,9 +1407,41 @@ class ElectricalMeasurementRMSCurrentPhC(ElectricalMeasurementRMSCurrent): _attr_max_attribute_name: str = "rms_current_max_ph_c" _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_current_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_current_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_current_ph_c: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_current_max_ph_c: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -962,13 +1452,50 @@ class ElectricalMeasurementRMSVoltage(BaseElectricalMeasurement): _unique_id_suffix = "rms_voltage" _attr_max_attribute_name = "rms_voltage_max" _divisor_attribute_name = "ac_voltage_divisor" + _divisor_fallback_attribute_name = None _multiplier_attribute_name = "ac_voltage_multiplier" + _multiplier_fallback_attribute_name = None _attr_device_class: SensorDeviceClass = SensorDeviceClass.VOLTAGE _attr_native_unit_of_measurement = UnitOfElectricPotential.VOLT - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _attr_suggested_display_precision = 1 + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_voltage_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_voltage_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_voltage: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_voltage_max: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -981,9 +1508,41 @@ class ElectricalMeasurementRMSVoltagePhB(ElectricalMeasurementRMSVoltage): _attr_max_attribute_name = "rms_voltage_max_ph_b" _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_voltage_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_voltage_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_voltage_ph_b: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_voltage_max_ph_b: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -996,9 +1555,41 @@ class ElectricalMeasurementRMSVoltagePhC(ElectricalMeasurementRMSVoltage): _attr_max_attribute_name = "rms_voltage_max_ph_c" _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_voltage_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_voltage_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_voltage_ph_c: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.rms_voltage_max_ph_c: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -1010,13 +1601,44 @@ class ElectricalMeasurementFrequency(BaseElectricalMeasurement): _attr_translation_key: str = "ac_frequency" _attr_max_attribute_name = "ac_frequency_max" _divisor_attribute_name = "ac_frequency_divisor" + _divisor_fallback_attribute_name = None _multiplier_attribute_name = "ac_frequency_multiplier" + _multiplier_fallback_attribute_name = None _attr_device_class: SensorDeviceClass = SensorDeviceClass.FREQUENCY _attr_native_unit_of_measurement = UnitOfFrequency.HERTZ - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _attr_suggested_display_precision = 1 + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_frequency_multiplier: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_frequency_divisor: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.ac_frequency: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.ac_frequency_max: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -1025,12 +1647,34 @@ class ElectricalMeasurementPowerFactor(BaseElectricalMeasurement): _attribute_name = "power_factor" _unique_id_suffix = "power_factor" + _attr_max_attribute_name = None + _divisor_attribute_name = None + _divisor_fallback_attribute_name = None + _multiplier_attribute_name = None + _multiplier_fallback_attribute_name = None _attr_device_class: SensorDeviceClass = SensorDeviceClass.POWER_FACTOR _attr_native_unit_of_measurement = PERCENTAGE - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _attr_suggested_display_precision = 1 + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.power_factor: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -1042,9 +1686,23 @@ class ElectricalMeasurementPowerFactorPhB(ElectricalMeasurementPowerFactor): _attr_translation_key: str = "power_factor_ph_b" _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.power_factor_ph_b: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -1056,9 +1714,23 @@ class ElectricalMeasurementPowerFactorPhC(ElectricalMeasurementPowerFactor): _attr_translation_key: str = "power_factor_ph_c" _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.power_factor_ph_c: AttrConfig( + read_on_startup=False, + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -1070,13 +1742,48 @@ class ElectricalMeasurementDCVoltage(BaseElectricalMeasurement): _attr_translation_key: str = "dc_voltage" _attr_device_class: SensorDeviceClass = SensorDeviceClass.VOLTAGE _attr_native_unit_of_measurement = UnitOfElectricPotential.VOLT + _attr_max_attribute_name = None _divisor_attribute_name = "dc_voltage_divisor" + _divisor_fallback_attribute_name = None _multiplier_attribute_name = "dc_voltage_multiplier" + _multiplier_fallback_attribute_name = None + _attr_suggested_display_precision = 1 + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.dc_voltage_multiplier: AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.dc_voltage_divisor: AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.dc_voltage: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -1088,13 +1795,48 @@ class ElectricalMeasurementDCCurrent(BaseElectricalMeasurement): _attr_translation_key: str = "dc_current" _attr_device_class: SensorDeviceClass = SensorDeviceClass.CURRENT _attr_native_unit_of_measurement = UnitOfElectricCurrent.AMPERE + _attr_max_attribute_name = None _divisor_attribute_name = "dc_current_divisor" + _divisor_fallback_attribute_name = None _multiplier_attribute_name = "dc_current_multiplier" + _multiplier_fallback_attribute_name = None + _attr_suggested_display_precision = 1 + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.dc_current_multiplier: AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.dc_current_divisor: AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.dc_current: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } @register_entity(ElectricalMeasurement.cluster_id) @@ -1106,13 +1848,60 @@ class ElectricalMeasurementDCPower(BaseElectricalMeasurement): _attr_translation_key: str = "dc_power" _attr_device_class: SensorDeviceClass = SensorDeviceClass.POWER _attr_native_unit_of_measurement = UnitOfPower.WATT + _attr_max_attribute_name = None _divisor_attribute_name = "dc_power_divisor" + _divisor_fallback_attribute_name = "power_divisor" _multiplier_attribute_name = "dc_power_multiplier" + _multiplier_fallback_attribute_name = "power_multiplier" + _attr_suggested_display_precision = 1 + _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = ElectricalMeasurement.cluster_id _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT}), - ) + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalMeasurement.cluster_id}), + ) + + _server_cluster_config = { + ElectricalMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalMeasurement.AttributeDefs.measurement_type: AttrConfig( + read_on_startup=False, + ), + ElectricalMeasurement.AttributeDefs.dc_power_multiplier: AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.dc_power_divisor: AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_multiplier: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.power_divisor: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + ElectricalMeasurement.AttributeDefs.dc_power: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } @register_entity(RelativeHumidity.cluster_id) @@ -1125,10 +1914,25 @@ class Humidity(Sensor): _divisor = 100 _attr_native_unit_of_measurement = PERCENTAGE _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_HUMIDITY}), - ) + _cluster_id = RelativeHumidity.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({RelativeHumidity.cluster_id}), + ) + + _server_cluster_config = { + RelativeHumidity.cluster_id: ClusterConfig( + bind=True, + attributes={ + RelativeHumidity.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=100 + ), + ), + }, + ), + } @register_entity(SMARTTHINGS_HUMIDITY_CLUSTER) @@ -1141,12 +1945,25 @@ class SmartThingsHumidity(Sensor): _divisor = 100 _attr_native_unit_of_measurement = PERCENTAGE _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset( - {f"cluster_handler_0x{SMARTTHINGS_HUMIDITY_CLUSTER:04x}"} + _cluster_id = SMARTTHINGS_HUMIDITY_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({SMARTTHINGS_HUMIDITY_CLUSTER}), + ) + + _server_cluster_config = { + SMARTTHINGS_HUMIDITY_CLUSTER: ClusterConfig( + bind=True, + attributes={ + "measured_value": AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=50 + ), + ), + }, ), - ) + } @register_entity(SoilMoistureCluster.cluster_id) @@ -1160,10 +1977,25 @@ class SoilMoisture(Sensor): _divisor = 100 _attr_native_unit_of_measurement = PERCENTAGE _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SOIL_MOISTURE}), - ) + _cluster_id = SoilMoistureCluster.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({SoilMoistureCluster.cluster_id}), + ) + + _server_cluster_config = { + SoilMoistureCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + SoilMoistureCluster.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=100 + ), + ), + }, + ), + } @register_entity(LeafWetnessCluster.cluster_id) @@ -1177,10 +2009,25 @@ class LeafWetness(Sensor): _divisor = 100 _attr_native_unit_of_measurement = PERCENTAGE _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_LEAF_WETNESS}), - ) + _cluster_id = LeafWetnessCluster.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({LeafWetnessCluster.cluster_id}), + ) + + _server_cluster_config = { + LeafWetnessCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + LeafWetnessCluster.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=100 + ), + ), + }, + ), + } @register_entity(IlluminanceMeasurement.cluster_id) @@ -1192,10 +2039,25 @@ class Illuminance(Sensor): _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT _attr_native_unit_of_measurement = LIGHT_LUX _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ILLUMINANCE}), - ) + _cluster_id = IlluminanceMeasurement.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({IlluminanceMeasurement.cluster_id}), + ) + + _server_cluster_config = { + IlluminanceMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + IlluminanceMeasurement.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } def formatter(self, value: int) -> int | None: """Convert illumination data.""" @@ -1218,11 +2080,37 @@ class SmartEnergyMeteringEntityDescription: @register_entity(Metering.cluster_id) -class SmartEnergyMetering(PollableSensor): +class MeteringPoller(AggregatedClusterPoller): + """Polls the Metering cluster for models known to need polling. + + Default Metering devices report reliably; only this short list of models + are known to require polling. + """ + + _unique_id_suffix = "metering_poller" + _cluster_id = Metering.cluster_id + _cluster_match = ClusterMatch( + server_clusters=frozenset({Metering.cluster_id}), + models=frozenset({"TS011F", "ZLinky_TIC", "TICMeter"}), + ) + + +@register_entity(Metering.cluster_id) +class ExposedFeatureMeteringPoller(MeteringPoller): + """Polls the Metering cluster for devices whose quirk exposes SE_POLL_SUMMATION.""" + + _unique_id_suffix = "metering_poller" + _cluster_match = ClusterMatch( + server_clusters=frozenset({Metering.cluster_id}), + exposed_features=frozenset({SE_POLL_SUMMATION}), + ) + + +@register_entity(Metering.cluster_id) +class SmartEnergyMetering(Sensor): """Metering sensor.""" entity_description: SmartEnergyMeteringEntityDescription - _use_custom_polling: bool = False _attr_suggested_display_precision = 1 _attribute_name = "instantaneous_demand" _attr_translation_key: str = "instantaneous_demand" @@ -1232,10 +2120,97 @@ class SmartEnergyMetering(PollableSensor): "zcl_unit_of_measurement", } _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), - ) + _cluster_id = Metering.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({Metering.cluster_id}), + ) + + _server_cluster_config = { + Metering.cluster_id: ClusterConfig( + bind=True, + attributes={ + Metering.AttributeDefs.instantaneous_demand: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=5, max_interval=900, reportable_change=1 + ), + ), + Metering.AttributeDefs.current_summ_delivered: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Metering.AttributeDefs.current_tier1_summ_delivered: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Metering.AttributeDefs.current_tier2_summ_delivered: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Metering.AttributeDefs.current_tier3_summ_delivered: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Metering.AttributeDefs.current_tier4_summ_delivered: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Metering.AttributeDefs.current_tier5_summ_delivered: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Metering.AttributeDefs.current_tier6_summ_delivered: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Metering.AttributeDefs.current_summ_received: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Metering.AttributeDefs.status: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=1, max_interval=900, reportable_change=1 + ), + ), + Metering.AttributeDefs.demand_formatting: AttrConfig( + read_on_startup=False, + ), + Metering.AttributeDefs.divisor: AttrConfig( + read_on_startup=False, + ), + Metering.AttributeDefs.metering_device_type: AttrConfig( + read_on_startup=False, + ), + Metering.AttributeDefs.multiplier: AttrConfig( + read_on_startup=False, + ), + Metering.AttributeDefs.summation_formatting: AttrConfig( + read_on_startup=False, + ), + Metering.AttributeDefs.unit_of_measure: AttrConfig( + read_on_startup=False, + ), + }, + ), + } _ENTITY_DESCRIPTION_MAP = { 0x00: SmartEnergyMeteringEntityDescription( @@ -1294,8 +2269,34 @@ class SmartEnergyMetering(PollableSensor): ), } + @property + def _unit_of_measurement(self) -> int | None: + return self._cluster.get(Metering.AttributeDefs.unit_of_measure.name) + + @property + def _device_type(self) -> str | int | None: + dev_type = self._cluster.get(Metering.AttributeDefs.metering_device_type.name) + if dev_type is None: + return None + return metering_device_type_name(dev_type) + + @property + def _metering_status(self) -> int | None: + if (status := self._cluster.get(Metering.AttributeDefs.status.name)) is None: + return None + dev_type = self._cluster.get(Metering.AttributeDefs.metering_device_type.name) + if dev_type in METERING_DEVICE_TYPES_ELECTRIC: + return DeviceStatusElectric(status) + if dev_type in METERING_DEVICE_TYPES_GAS: + return DeviceStatusGas(status) + if dev_type in METERING_DEVICE_TYPES_WATER: + return DeviceStatusWater(status) + if dev_type in METERING_DEVICE_TYPES_HEATING_COOLING: + return DeviceStatusHeatingCooling(status) + return DeviceStatusDefault(status) + def _is_supported(self) -> bool: - unit = self._cluster_handler.unit_of_measurement + unit = self._unit_of_measurement if self._is_non_value(unit, attr_def=Metering.AttributeDefs.unit_of_measure): return False @@ -1304,9 +2305,7 @@ def _is_supported(self) -> bool: def recompute_capabilities(self) -> None: """Recompute capabilities and feature flags.""" super().recompute_capabilities() - entity_description = self._ENTITY_DESCRIPTION_MAP.get( - self._cluster_handler.unit_of_measurement - ) + entity_description = self._ENTITY_DESCRIPTION_MAP.get(self._unit_of_measurement) if entity_description is not None: self.entity_description = entity_description self._attr_device_class = entity_description.device_class @@ -1319,21 +2318,21 @@ def recompute_capabilities(self) -> None: def state(self) -> dict[str, Any]: """Return state for this sensor.""" response = super().state - if self._cluster_handler.device_type is not None: - response["device_type"] = self._cluster_handler.device_type - if (status := self._cluster_handler.metering_status) is not None: + if self._device_type is not None: + response["device_type"] = self._device_type + if (status := self._metering_status) is not None: if isinstance(status, enum.IntFlag): response["status"] = str( status.name if status.name is not None else status.value ) else: response["status"] = str(status)[len(status.__class__.__name__) + 1 :] - response["zcl_unit_of_measurement"] = self._cluster_handler.unit_of_measurement + response["zcl_unit_of_measurement"] = self._unit_of_measurement return response @property def _multiplier(self) -> int | float | None: - return self._cluster_handler.multiplier + return self._cluster.get(Metering.AttributeDefs.multiplier.name) or 1 @_multiplier.setter def _multiplier(self, value: int | float | None) -> None: @@ -1341,7 +2340,7 @@ def _multiplier(self, value: int | float | None) -> None: @property def _divisor(self) -> int | float | None: - return self._cluster_handler.divisor + return self._cluster.get(Metering.AttributeDefs.divisor.name) or 1 @_divisor.setter def _divisor(self, value: int | float | None) -> None: @@ -1352,20 +2351,18 @@ def formatter(self, value: int) -> int | float: # TODO: improve typing for base class scaled_value = cast(float, super().formatter(value)) - if ( - self._cluster_handler.unit_of_measurement - == MeteringUnitofMeasure.Kwh_and_Kwh_binary - ): + if self._unit_of_measurement == MeteringUnitofMeasure.Kwh_and_Kwh_binary: # Zigbee spec power unit is kW, but we show the value in W value_watt = scaled_value * 1000 if value_watt < 100: return round(value_watt, 1) return round(value_watt) + demand_formatting = self._cluster.get( + Metering.AttributeDefs.demand_formatting.name + ) demand_formater = create_number_formatter( - self._cluster_handler.demand_formatting - if self._cluster_handler.demand_formatting is not None - else DEFAULT_FORMATTING + demand_formatting if demand_formatting is not None else DEFAULT_FORMATTING ) return float(demand_formater.format(scaled_value)) @@ -1388,9 +2385,8 @@ class SmartEnergySummation(SmartEnergyMetering): _attr_translation_key: str = "summation_delivered" _attr_suggested_display_precision: int = 3 - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), - feature_priority=(PlatformFeatureGroup.SMART_ENERGY_SUMMATION, 0), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Metering.cluster_id}), ) _ENTITY_DESCRIPTION_MAP = { @@ -1455,174 +2451,121 @@ def formatter(self, value: int) -> int | float: # TODO: improve typing for base class scaled_value = cast(float, Sensor.formatter(self, value)) - if ( - self._cluster_handler.unit_of_measurement - == MeteringUnitofMeasure.Kwh_and_Kwh_binary - ): + if self._unit_of_measurement == MeteringUnitofMeasure.Kwh_and_Kwh_binary: return scaled_value + summation_formatting = self._cluster.get( + Metering.AttributeDefs.summation_formatting.name + ) summation_formater = create_number_formatter( - self._cluster_handler.summation_formatting - if self._cluster_handler.summation_formatting is not None + summation_formatting + if summation_formatting is not None else DEFAULT_FORMATTING ) return float(summation_formater.format(scaled_value)) @register_entity(Metering.cluster_id) -class PolledSmartEnergySummation(SmartEnergySummation): - """Polled Smart Energy Metering summation sensor.""" - - _use_custom_polling: bool = True - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), - models=frozenset({"TS011F", "ZLinky_TIC", "TICMeter"}), - feature_priority=(PlatformFeatureGroup.SMART_ENERGY_SUMMATION, 1), - ) - - -@register_entity(Metering.cluster_id) -class ExposedFeaturePolledSmartEnergySummation(PolledSmartEnergySummation): - """Polled Smart Energy Metering summation sensor via exposed feature.""" - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), - exposed_features=frozenset({SE_POLL_SUMMATION}), - feature_priority=(PlatformFeatureGroup.SMART_ENERGY_SUMMATION, 1), - ) - - -@register_entity(Metering.cluster_id) -class Tier1SmartEnergySummation(PolledSmartEnergySummation): +class Tier1SmartEnergySummation(SmartEnergySummation): """Tier 1 Smart Energy Metering summation sensor.""" - _use_custom_polling = False # Poll indirectly by PolledSmartEnergySummation _attribute_name = "current_tier1_summ_delivered" _unique_id_suffix = "tier1_summation_delivered" _attr_translation_key: str = "tier1_summation_delivered" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Metering.cluster_id}), models=frozenset({"ZLinky_TIC", "TICMeter"}), - feature_priority=(PlatformFeatureGroup.SMART_ENERGY_SUMMATION, 1), ) @register_entity(Metering.cluster_id) -class Tier2SmartEnergySummation(PolledSmartEnergySummation): +class Tier2SmartEnergySummation(SmartEnergySummation): """Tier 2 Smart Energy Metering summation sensor.""" - _use_custom_polling = False # Poll indirectly by PolledSmartEnergySummation _attribute_name = "current_tier2_summ_delivered" _unique_id_suffix = "tier2_summation_delivered" _attr_translation_key: str = "tier2_summation_delivered" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Metering.cluster_id}), models=frozenset({"ZLinky_TIC", "TICMeter"}), - feature_priority=(PlatformFeatureGroup.SMART_ENERGY_SUMMATION, 1), ) @register_entity(Metering.cluster_id) -class Tier3SmartEnergySummation(PolledSmartEnergySummation): +class Tier3SmartEnergySummation(SmartEnergySummation): """Tier 3 Smart Energy Metering summation sensor.""" - _use_custom_polling = False # Poll indirectly by PolledSmartEnergySummation _attribute_name = "current_tier3_summ_delivered" _unique_id_suffix = "tier3_summation_delivered" _attr_translation_key: str = "tier3_summation_delivered" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Metering.cluster_id}), models=frozenset({"ZLinky_TIC", "TICMeter"}), - feature_priority=(PlatformFeatureGroup.SMART_ENERGY_SUMMATION, 1), ) @register_entity(Metering.cluster_id) -class Tier4SmartEnergySummation(PolledSmartEnergySummation): +class Tier4SmartEnergySummation(SmartEnergySummation): """Tier 4 Smart Energy Metering summation sensor.""" - _use_custom_polling = False # Poll indirectly by PolledSmartEnergySummation _attribute_name = "current_tier4_summ_delivered" _unique_id_suffix = "tier4_summation_delivered" _attr_translation_key: str = "tier4_summation_delivered" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Metering.cluster_id}), models=frozenset({"ZLinky_TIC", "TICMeter"}), - feature_priority=(PlatformFeatureGroup.SMART_ENERGY_SUMMATION, 1), ) @register_entity(Metering.cluster_id) -class Tier5SmartEnergySummation(PolledSmartEnergySummation): +class Tier5SmartEnergySummation(SmartEnergySummation): """Tier 5 Smart Energy Metering summation sensor.""" - _use_custom_polling = False # Poll indirectly by PolledSmartEnergySummation _attribute_name = "current_tier5_summ_delivered" _unique_id_suffix = "tier5_summation_delivered" _attr_translation_key: str = "tier5_summation_delivered" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Metering.cluster_id}), models=frozenset({"ZLinky_TIC", "TICMeter"}), - feature_priority=(PlatformFeatureGroup.SMART_ENERGY_SUMMATION, 1), ) @register_entity(Metering.cluster_id) -class Tier6SmartEnergySummation(PolledSmartEnergySummation): +class Tier6SmartEnergySummation(SmartEnergySummation): """Tier 6 Smart Energy Metering summation sensor.""" - _use_custom_polling = False # Poll indirectly by PolledSmartEnergySummation _attribute_name = "current_tier6_summ_delivered" _unique_id_suffix = "tier6_summation_delivered" _attr_translation_key: str = "tier6_summation_delivered" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Metering.cluster_id}), models=frozenset({"ZLinky_TIC", "TICMeter"}), - feature_priority=(PlatformFeatureGroup.SMART_ENERGY_SUMMATION, 1), ) @register_entity(Metering.cluster_id) -class SmartEnergySummationReceived(PolledSmartEnergySummation): +class SmartEnergySummationReceived(SmartEnergySummation): """Smart Energy Metering summation received sensor.""" - _use_custom_polling = False # Poll indirectly by PolledSmartEnergySummation _attribute_name = "current_summ_received" _unique_id_suffix = "summation_received" _attr_translation_key: str = "summation_received" - """ - This attribute only started to be initialized in HA 2024.2.0, - so the entity would be created on the first HA start after the - upgrade for existing devices, as the initialization to see if - an attribute is unsupported happens later in the background. - To avoid creating unnecessary entities for existing devices, - wait until the attribute was properly initialized once for now. - """ - _skip_creation_if_no_attr_cache = True - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), - feature_priority=(PlatformFeatureGroup.SMART_ENERGY_SUMMATION_RECEIVED, 0), - ) - -@register_entity(Metering.cluster_id) -class ExposedFeaturePolledSmartEnergySummationReceived(SmartEnergySummationReceived): - """Polled Smart Energy Metering summation received sensor via exposed feature.""" - - _use_custom_polling = True + # This attribute only started to be initialized in HA 2024.2.0, so the entity would + # be created on the first HA start after the upgrade for existing devices, as the + # initialization to see if an attribute is unsupported happens later in the + # background. To avoid creating unnecessary entities for existing devices, wait + # until the attribute was properly initialized once for now. + _skip_creation_if_no_attr_cache = True - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_SMARTENERGY_METERING}), - exposed_features=frozenset({SE_POLL_SUMMATION}), - feature_priority=(PlatformFeatureGroup.SMART_ENERGY_SUMMATION_RECEIVED, 1), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Metering.cluster_id}), ) @@ -1636,10 +2579,25 @@ class Pressure(Sensor): _attr_suggested_display_precision: int = 0 _attr_native_unit_of_measurement = UnitOfPressure.HPA _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_PRESSURE}), - ) + _cluster_id = PressureMeasurement.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({PressureMeasurement.cluster_id}), + ) + + _server_cluster_config = { + PressureMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + PressureMeasurement.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } @register_entity(FlowMeasurement.cluster_id) @@ -1652,10 +2610,25 @@ class Flow(Sensor): _divisor = 10 _attr_native_unit_of_measurement = UnitOfVolumeFlowRate.CUBIC_METERS_PER_HOUR _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_FLOW}), - ) + _cluster_id = FlowMeasurement.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({FlowMeasurement.cluster_id}), + ) + + _server_cluster_config = { + FlowMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + FlowMeasurement.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } @register_entity(TemperatureMeasurement.cluster_id) @@ -1668,10 +2641,25 @@ class Temperature(Sensor): _divisor = 100 _attr_native_unit_of_measurement = UnitOfTemperature.CELSIUS _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_TEMPERATURE}), - ) + _cluster_id = TemperatureMeasurement.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({TemperatureMeasurement.cluster_id}), + ) + + _server_cluster_config = { + TemperatureMeasurement.cluster_id: ClusterConfig( + bind=True, + attributes={ + TemperatureMeasurement.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=50 + ), + ), + }, + ), + } @register_entity(DeviceTemperatureCluster.cluster_id) @@ -1686,10 +2674,25 @@ class DeviceTemperature(Sensor): _attr_native_unit_of_measurement = UnitOfTemperature.CELSIUS _attr_entity_category = EntityCategory.DIAGNOSTIC _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_DEVICE_TEMPERATURE}), - ) + _cluster_id = DeviceTemperatureCluster.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({DeviceTemperatureCluster.cluster_id}), + ) + + _server_cluster_config = { + DeviceTemperatureCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + DeviceTemperatureCluster.AttributeDefs.current_temperature: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=50 + ), + ), + }, + ), + } @register_entity(INOVELLI_CLUSTER) @@ -1702,9 +2705,10 @@ class InovelliInternalTemperature(Sensor): _attr_translation_key: str = "internal_temp_monitor" _attr_native_unit_of_measurement = UnitOfTemperature.CELSIUS _attr_entity_category = EntityCategory.DIAGNOSTIC + _cluster_id = INOVELLI_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -1724,9 +2728,10 @@ class InovelliOverheated(EnumSensor): _attr_translation_key: str = "overheated" _enum = InovelliOverheatedState _attr_entity_category = EntityCategory.DIAGNOSTIC + _cluster_id = INOVELLI_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -1741,10 +2746,25 @@ class CarbonDioxideConcentration(Sensor): _multiplier = 1e6 _attr_native_unit_of_measurement = CONCENTRATION_PARTS_PER_MILLION _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"carbon_dioxide_concentration"}), - ) + _cluster_id = CarbonDioxideConcentrationCluster.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({CarbonDioxideConcentrationCluster.cluster_id}), + ) + + _server_cluster_config = { + CarbonDioxideConcentrationCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + CarbonDioxideConcentrationCluster.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=0.000001 + ), + ), + }, + ), + } @register_entity(CarbonMonoxideConcentrationCluster.cluster_id) @@ -1758,13 +2778,28 @@ class CarbonMonoxideConcentration(Sensor): _multiplier = 1e6 _attr_native_unit_of_measurement = CONCENTRATION_PARTS_PER_MILLION _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"carbon_monoxide_concentration"}), - ) + _cluster_id = CarbonMonoxideConcentrationCluster.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({CarbonMonoxideConcentrationCluster.cluster_id}), + ) + + _server_cluster_config = { + CarbonMonoxideConcentrationCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + CarbonMonoxideConcentrationCluster.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=0.000001 + ), + ), + }, + ), + } -@register_entity(0x042E) +@register_entity(VOC_LEVEL_CLUSTER) class VOCLevel(Sensor): """VOC Level sensor.""" @@ -1776,30 +2811,17 @@ class VOCLevel(Sensor): _attr_native_unit_of_measurement = CONCENTRATION_MICROGRAMS_PER_CUBIC_METER _attr_primary_weight = 1 - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"voc_level"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({VOC_LEVEL_CLUSTER}), feature_priority=(PlatformFeatureGroup.VOC_LEVEL, 0), ) - -@register_entity(0x042E) -class GenericVOCLevel(Sensor): - """VOC Level sensor.""" - - _attribute_name = "measured_value" - _attr_device_class: SensorDeviceClass = SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS - _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT - _attr_suggested_display_precision = 0 - _multiplier = 1e6 - _attr_native_unit_of_measurement = CONCENTRATION_MICROGRAMS_PER_CUBIC_METER - _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"cluster_handler_0x042e"}), - ) + _server_cluster_config = { + VOC_LEVEL_CLUSTER: ClusterConfig(bind=True), + } -@register_entity(0x042E) +@register_entity(VOC_LEVEL_CLUSTER) class PPBVOCLevel(Sensor): """VOC Level sensor.""" @@ -1813,12 +2835,16 @@ class PPBVOCLevel(Sensor): _attr_native_unit_of_measurement = CONCENTRATION_PARTS_PER_BILLION _attr_primary_weight = 1 - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"voc_level"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({VOC_LEVEL_CLUSTER}), models=frozenset({"lumi.airmonitor.acn01"}), feature_priority=(PlatformFeatureGroup.VOC_LEVEL, 1), ) + _server_cluster_config = { + VOC_LEVEL_CLUSTER: ClusterConfig(bind=True), + } + @register_entity(PM25Cluster.cluster_id) class PM25(Sensor): @@ -1830,10 +2856,25 @@ class PM25(Sensor): _multiplier = 1 _attr_native_unit_of_measurement = CONCENTRATION_MICROGRAMS_PER_CUBIC_METER _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"pm25"}), - ) + _cluster_id = PM25Cluster.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({PM25Cluster.cluster_id}), + ) + + _server_cluster_config = { + PM25Cluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + PM25Cluster.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=0.1 + ), + ), + }, + ), + } @register_entity(ElectricalConductivityCluster.cluster_id) @@ -1844,10 +2885,25 @@ class ElectricalConductivity(Sensor): _attr_device_class: SensorDeviceClass = SensorDeviceClass.CONDUCTIVITY _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT _attr_native_unit_of_measurement = UnitOfConductivity.MICROSIEMENS_PER_CM - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ELECTRICAL_CONDUCTIVITY}), - ) + _cluster_id = ElectricalConductivityCluster.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({ElectricalConductivityCluster.cluster_id}), + ) + + _server_cluster_config = { + ElectricalConductivityCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + ElectricalConductivityCluster.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } @register_entity(FormaldehydeConcentrationCluster.cluster_id) @@ -1861,10 +2917,25 @@ class FormaldehydeConcentration(Sensor): _multiplier = 1e6 _attr_native_unit_of_measurement = CONCENTRATION_PARTS_PER_MILLION _attr_primary_weight = 1 - - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"formaldehyde_concentration"}), - ) + _cluster_id = FormaldehydeConcentrationCluster.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({FormaldehydeConcentrationCluster.cluster_id}), + ) + + _server_cluster_config = { + FormaldehydeConcentrationCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + FormaldehydeConcentrationCluster.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=0.000001 + ), + ), + }, + ), + } @register_entity(Thermostat.cluster_id) @@ -1873,23 +2944,151 @@ class ThermostatHVACAction(Sensor): _unique_id_suffix = "hvac_action" _attr_translation_key: str = "hvac_action" + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), feature_priority=(PlatformFeatureGroup.HVAC_ACTION, 0), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + Thermostat.AttributeDefs.local_temperature: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.occupied_cooling_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.occupied_heating_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.unoccupied_cooling_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.unoccupied_heating_setpoint: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=25 + ), + ), + Thermostat.AttributeDefs.running_mode: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.running_state: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.system_mode: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.occupancy: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + Thermostat.AttributeDefs.pi_cooling_demand: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=5 + ), + ), + Thermostat.AttributeDefs.pi_heating_demand: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=5 + ), + ), + Thermostat.AttributeDefs.abs_min_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.abs_max_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.abs_min_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.abs_max_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.ctrl_sequence_of_oper: AttrConfig( + read_on_startup=True, + ), + Thermostat.AttributeDefs.max_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.max_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.min_cool_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.min_heat_setpoint_limit: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.local_temperature_calibration: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.setpoint_change_source: AttrConfig( + read_on_startup=False, + ), + Thermostat.AttributeDefs.setpoint_change_source_timestamp: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def _is_supported(self) -> bool: return PlatformEntity._is_supported(self) + @property + def _pi_heating_demand(self) -> int | None: + return self._cluster.get(Thermostat.AttributeDefs.pi_heating_demand.name) + + @property + def _pi_cooling_demand(self) -> int | None: + return self._cluster.get(Thermostat.AttributeDefs.pi_cooling_demand.name) + + @property + def _running_state(self) -> int | None: + return self._cluster.get(Thermostat.AttributeDefs.running_state.name) + + @property + def _running_mode(self) -> int | None: + return self._cluster.get(Thermostat.AttributeDefs.running_mode.name) + + @property + def _system_mode(self) -> int | None: + return self._cluster.get(Thermostat.AttributeDefs.system_mode.name) + @property def state(self) -> dict: """Return the current HVAC action.""" response = super().state - if ( - self._cluster_handler.pi_heating_demand is None - and self._cluster_handler.pi_cooling_demand is None - ): + if self._pi_heating_demand is None and self._pi_cooling_demand is None: response["state"] = self._rm_rs_action else: response["state"] = self._pi_demand_action @@ -1898,10 +3097,7 @@ def state(self) -> dict: @property def native_value(self) -> str | None: """Return the current HVAC action.""" - if ( - self._cluster_handler.pi_heating_demand is None - and self._cluster_handler.pi_cooling_demand is None - ): + if self._pi_heating_demand is None and self._pi_cooling_demand is None: return self._rm_rs_action return self._pi_demand_action @@ -1909,36 +3105,34 @@ def native_value(self) -> str | None: def _rm_rs_action(self) -> HVACAction | None: """Return the current HVAC action based on running mode and running state.""" - if (running_state := self._cluster_handler.running_state) is None: + if (running_state := self._running_state) is None: return None rs_heat = ( - self._cluster_handler.RunningState.Heat_State_On - | self._cluster_handler.RunningState.Heat_2nd_Stage_On + Thermostat.RunningState.Heat_State_On + | Thermostat.RunningState.Heat_2nd_Stage_On ) if running_state & rs_heat: return HVACAction.HEATING rs_cool = ( - self._cluster_handler.RunningState.Cool_State_On - | self._cluster_handler.RunningState.Cool_2nd_Stage_On + Thermostat.RunningState.Cool_State_On + | Thermostat.RunningState.Cool_2nd_Stage_On ) if running_state & rs_cool: return HVACAction.COOLING - running_state = self._cluster_handler.running_state if running_state and running_state & ( - self._cluster_handler.RunningState.Fan_State_On - | self._cluster_handler.RunningState.Fan_2nd_Stage_On - | self._cluster_handler.RunningState.Fan_3rd_Stage_On + Thermostat.RunningState.Fan_State_On + | Thermostat.RunningState.Fan_2nd_Stage_On + | Thermostat.RunningState.Fan_3rd_Stage_On ): return HVACAction.FAN - running_state = self._cluster_handler.running_state - if running_state and running_state & self._cluster_handler.RunningState.Idle: + if running_state and running_state & Thermostat.RunningState.Idle: return HVACAction.IDLE - if self._cluster_handler.system_mode != self._cluster_handler.SystemMode.Off: + if self._system_mode != Thermostat.SystemMode.Off: return HVACAction.IDLE return HVACAction.OFF @@ -1946,14 +3140,14 @@ def _rm_rs_action(self) -> HVACAction | None: def _pi_demand_action(self) -> HVACAction: """Return the current HVAC action based on pi_demands.""" - heating_demand = self._cluster_handler.pi_heating_demand + heating_demand = self._pi_heating_demand if heating_demand is not None and heating_demand > 0: return HVACAction.HEATING - cooling_demand = self._cluster_handler.pi_cooling_demand + cooling_demand = self._pi_cooling_demand if cooling_demand is not None and cooling_demand > 0: return HVACAction.COOLING - if self._cluster_handler.system_mode != self._cluster_handler.SystemMode.Off: + if self._system_mode != Thermostat.SystemMode.Off: return HVACAction.IDLE return HVACAction.OFF @@ -1962,8 +3156,8 @@ def _pi_demand_action(self) -> HVACAction: class SinopeHVACAction(ThermostatHVACAction): """Sinope Thermostat HVAC action sensor.""" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), manufacturers=frozenset({"Sinope Technologies"}), feature_priority=(PlatformFeatureGroup.HVAC_ACTION, 1), ) @@ -1972,22 +3166,22 @@ class SinopeHVACAction(ThermostatHVACAction): def _rm_rs_action(self) -> HVACAction: """Return the current HVAC action based on running mode and running state.""" - running_mode = self._cluster_handler.running_mode - if running_mode == self._cluster_handler.RunningMode.Heat: + running_mode = self._running_mode + if running_mode == Thermostat.RunningMode.Heat: return HVACAction.HEATING - if running_mode == self._cluster_handler.RunningMode.Cool: + if running_mode == Thermostat.RunningMode.Cool: return HVACAction.COOLING - running_state = self._cluster_handler.running_state + running_state = self._running_state if running_state and running_state & ( - self._cluster_handler.RunningState.Fan_State_On - | self._cluster_handler.RunningState.Fan_2nd_Stage_On - | self._cluster_handler.RunningState.Fan_3rd_Stage_On + Thermostat.RunningState.Fan_State_On + | Thermostat.RunningState.Fan_2nd_Stage_On + | Thermostat.RunningState.Fan_3rd_Stage_On ): return HVACAction.FAN if ( - self._cluster_handler.system_mode != self._cluster_handler.SystemMode.Off - and running_mode == self._cluster_handler.SystemMode.Off + self._system_mode != Thermostat.SystemMode.Off + and running_mode == Thermostat.SystemMode.Off ): return HVACAction.IDLE return HVACAction.OFF @@ -2005,20 +3199,20 @@ class RSSISensor(Sensor): _attr_entity_category = EntityCategory.DIAGNOSTIC _attr_entity_registry_enabled_default = False _attr_translation_key: str = "rssi" + _cluster_id = Basic.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_BASIC}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Basic.cluster_id}), ) def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Init.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) + super().__init__(endpoint=endpoint, device=device, **kwargs) def on_add(self) -> None: """Run when entity is added.""" @@ -2084,9 +3278,10 @@ class LQISensor(RSSISensor): _attr_device_class = None _attr_native_unit_of_measurement = None _attr_translation_key = "lqi" + _cluster_id = Basic.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_BASIC}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Basic.cluster_id}), ) @property @@ -2111,9 +3306,10 @@ class TimeLeft(Sensor): _attr_device_class: SensorDeviceClass = SensorDeviceClass.DURATION _attr_translation_key: str = "timer_time_left" _attr_native_unit_of_measurement = UnitOfTime.MINUTES + _cluster_id = TUYA_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"tuya_manufacturer"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({TUYA_MANUFACTURER_CLUSTER}), manufacturers=frozenset({"_TZE200_htnnfasr"}), ) @@ -2128,9 +3324,10 @@ class IkeaDeviceRunTime(Sensor): _attr_translation_key: str = "device_run_time" _attr_native_unit_of_measurement = UnitOfTime.MINUTES _attr_entity_category: EntityCategory = EntityCategory.DIAGNOSTIC + _cluster_id = IKEA_AIR_PURIFIER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"ikea_airpurifier"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({IKEA_AIR_PURIFIER_CLUSTER}), ) @@ -2144,9 +3341,10 @@ class IkeaFilterRunTime(Sensor): _attr_translation_key: str = "filter_run_time" _attr_native_unit_of_measurement = UnitOfTime.MINUTES _attr_entity_category: EntityCategory = EntityCategory.DIAGNOSTIC + _cluster_id = IKEA_AIR_PURIFIER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"ikea_airpurifier"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({IKEA_AIR_PURIFIER_CLUSTER}), ) @@ -2165,9 +3363,10 @@ class AqaraPetFeederLastFeedingSource(EnumSensor): _unique_id_suffix = "last_feeding_source" _attr_translation_key: str = "last_feeding_source" _enum = AqaraFeedingSource + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"aqara.feeder.acn001"}), ) @@ -2179,9 +3378,10 @@ class AqaraPetFeederLastFeedingSize(Sensor): _attribute_name = "last_feeding_size" _unique_id_suffix = "last_feeding_size" _attr_translation_key: str = "last_feeding_size" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"aqara.feeder.acn001"}), ) @@ -2194,9 +3394,10 @@ class AqaraPetFeederPortionsDispensed(Sensor): _unique_id_suffix = "portions_dispensed" _attr_translation_key: str = "portions_dispensed_today" _attr_state_class: SensorStateClass = SensorStateClass.TOTAL_INCREASING + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"aqara.feeder.acn001"}), ) @@ -2210,9 +3411,10 @@ class AqaraPetFeederWeightDispensed(Sensor): _attr_translation_key: str = "weight_dispensed_today" _attr_native_unit_of_measurement = UnitOfMass.GRAMS _attr_state_class: SensorStateClass = SensorStateClass.TOTAL_INCREASING + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"aqara.feeder.acn001"}), ) @@ -2227,9 +3429,10 @@ class AqaraSmokeDensityDbm(Sensor): _attr_native_unit_of_measurement = "dB/m" _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT _attr_suggested_display_precision = 3 + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.sensor_smoke.acn03"}), ) @@ -2249,9 +3452,10 @@ class SonoffPresenceSenorIlluminationStatus(EnumSensor): _unique_id_suffix = "last_illumination" _attr_translation_key: str = "last_illumination_state" _enum = SonoffIlluminationStates + _cluster_id = SONOFF_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"sonoff_manufacturer"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({SONOFF_CLUSTER}), models=frozenset({"SNZB-06P"}), ) @@ -2271,9 +3475,10 @@ class PiHeatingDemand(Sensor): _attr_suggested_display_precision = 0 _attr_state_class: SensorStateClass = SensorStateClass.MEASUREMENT + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), ) @@ -2297,9 +3502,10 @@ class SetpointChangeSource(EnumSensor): _attr_translation_key: str = "setpoint_change_source" _attr_entity_category = EntityCategory.DIAGNOSTIC _enum = SetpointChangeSourceEnum + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), ) @@ -2315,9 +3521,10 @@ class SetpointChangeSourceTimestamp(TimestampSensor): _attr_translation_key: str = "setpoint_change_source_timestamp" _attr_entity_category = EntityCategory.DIAGNOSTIC _attr_device_class = SensorDeviceClass.TIMESTAMP + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), ) def formatter(self, value: types.UTCTime) -> datetime: @@ -2334,11 +3541,23 @@ class WindowCoveringTypeSensor(EnumSensor): _unique_id_suffix: str = "window_covering_type" _attr_translation_key: str = "window_covering_type" _attr_entity_category = EntityCategory.DIAGNOSTIC + _cluster_id = WindowCovering.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_COVER}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({WindowCovering.cluster_id}), ) + _server_cluster_config = { + WindowCovering.cluster_id: ClusterConfig( + bind=True, + attributes={ + WindowCovering.AttributeDefs.window_covering_type: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + @register_entity(Basic.cluster_id) class AqaraCurtainMotorPowerSourceSensor(EnumSensor): @@ -2349,12 +3568,23 @@ class AqaraCurtainMotorPowerSourceSensor(EnumSensor): _unique_id_suffix: str = "power_source" _attr_translation_key: str = "power_source" _attr_entity_category = EntityCategory.DIAGNOSTIC + _cluster_id = Basic.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_BASIC}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Basic.cluster_id}), models=frozenset({"lumi.curtain.agl001"}), ) + _server_cluster_config = { + Basic.cluster_id: ClusterConfig( + attributes={ + Basic.AttributeDefs.power_source: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + class AqaraE1HookState(types.enum8): """Aqara hook state.""" @@ -2374,9 +3604,10 @@ class AqaraCurtainHookStateSensor(EnumSensor): _unique_id_suffix = "hooks_state" _attr_translation_key: str = "hooks_state" _attr_entity_category = EntityCategory.DIAGNOSTIC + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.curtain.agl001"}), ) @@ -2391,13 +3622,12 @@ class BitMapSensor(Sensor): def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Init this sensor.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) + super().__init__(endpoint=endpoint, device=device, **kwargs) self._attr_extra_state_attribute_names: set[str] = { bit.name for bit in list(self._bitmap) } @@ -2407,7 +3637,7 @@ def state(self) -> dict[str, Any]: """Return the state for this sensor.""" response = super().state response["state"] = self.native_value - value = self._cluster_handler.cluster.get(self._attribute_name) + value = self._cluster.get(self._attribute_name) for bit in list(self._bitmap): if value is None: response[bit.name] = False @@ -2418,7 +3648,7 @@ def state(self) -> dict[str, Any]: def formatter(self, _value: int) -> str: """Summary of all attributes.""" - value = self._cluster_handler.cluster.get(self._attribute_name) + value = self._cluster.get(self._attribute_name) state_attr = {} for bit in list(self._bitmap): @@ -2443,12 +3673,27 @@ class DanfossOpenWindowDetection(EnumSensor): _attribute_name = "open_window_detection" _attr_translation_key: str = "open_window_detected" _enum = danfoss_thermostat.DanfossOpenWindowDetectionEnum + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "open_window_detection": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossLoadEstimate(Sensor): @@ -2458,12 +3703,27 @@ class DanfossLoadEstimate(Sensor): _attribute_name = "load_estimate" _attr_translation_key: str = "load_estimate" _attr_entity_category = EntityCategory.DIAGNOSTIC + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "load_estimate": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossAdaptationRunStatus(BitMapSensor): @@ -2474,12 +3734,27 @@ class DanfossAdaptationRunStatus(BitMapSensor): _attr_translation_key: str = "adaptation_run_status" _attr_entity_category = EntityCategory.DIAGNOSTIC _bitmap = danfoss_thermostat.DanfossAdaptationRunStatusBitmap + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "adaptation_run_status": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossPreheatTime(Sensor): @@ -2490,12 +3765,27 @@ class DanfossPreheatTime(Sensor): _attr_translation_key: str = "preheat_time" _attr_entity_registry_enabled_default = False _attr_entity_category = EntityCategory.DIAGNOSTIC + _cluster_id = Thermostat.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "preheat_time": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } + @register_entity(Diagnostic.cluster_id) class DanfossSoftwareErrorCode(BitMapSensor): @@ -2506,12 +3796,27 @@ class DanfossSoftwareErrorCode(BitMapSensor): _attr_translation_key: str = "software_error" _attr_entity_category = EntityCategory.DIAGNOSTIC _bitmap = danfoss_thermostat.DanfossSoftwareErrorCodeBitmap + _cluster_id = Diagnostic.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_DIAGNOSTIC}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Diagnostic.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Diagnostic.cluster_id: ClusterConfig( + bind=True, + attributes={ + "sw_error_code": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } + @register_entity(Diagnostic.cluster_id) class DanfossMotorStepCounter(Sensor): @@ -2521,12 +3826,27 @@ class DanfossMotorStepCounter(Sensor): _attribute_name = "motor_step_counter" _attr_translation_key: str = "motor_stepcount" _attr_entity_category = EntityCategory.DIAGNOSTIC + _cluster_id = Diagnostic.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_DIAGNOSTIC}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Diagnostic.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Diagnostic.cluster_id: ClusterConfig( + bind=True, + attributes={ + "motor_step_counter": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=1 + ), + ), + }, + ), + } + @register_entity(WindSpeedCluster.cluster_id) class WindSpeed(Sensor): @@ -2538,7 +3858,22 @@ class WindSpeed(Sensor): _divisor = 100 _attr_native_unit_of_measurement = UnitOfSpeed.METERS_PER_SECOND _attr_primary_weight = 2 + _cluster_id = WindSpeedCluster.cluster_id + + _server_cluster_config = { + WindSpeedCluster.cluster_id: ClusterConfig( + bind=True, + attributes={ + WindSpeedCluster.AttributeDefs.measured_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=30, max_interval=900, reportable_change=0.01 + ), + ), + }, + ), + } - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_WIND_SPEED}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({WindSpeedCluster.cluster_id}), ) diff --git a/zha/application/platforms/sensor/const.py b/zha/application/platforms/sensor/const.py index 093aaced9..82420a5d9 100644 --- a/zha/application/platforms/sensor/const.py +++ b/zha/application/platforms/sensor/const.py @@ -1,9 +1,12 @@ """Constants for the sensor platform.""" from datetime import UTC, datetime +import enum from zigpy.quirks.v2.homeassistant.sensor import SensorDeviceClass, SensorStateClass from zigpy.zcl.clusters.general_const import AnalogInputType +from zigpy.zcl.clusters.homeautomation import MeasurementType +from zigpy.zcl.clusters.smartenergy import MeteringDeviceType from zha.units import ( CONCENTRATION_PARTS_PER_MILLION, @@ -69,3 +72,131 @@ } ZCL_EPOCH = datetime(2000, 1, 1, tzinfo=UTC) + +# Remapping of `MeasurementType` members to legacy names, for extra state attributes. +# TODO: deprecate this. +LEGACY_MEASUREMENT_TYPE_REMAPPING = { + MeasurementType.Active_measurement_AC: "ACTIVE_MEASUREMENT", + MeasurementType.Reactive_measurement_AC: "REACTIVE_MEASUREMENT", + MeasurementType.Apparent_measurement_AC: "APPARENT_MEASUREMENT", + MeasurementType.Phase_A_measurement: "PHASE_A_MEASUREMENT", + MeasurementType.Phase_B_measurement: "PHASE_B_MEASUREMENT", + MeasurementType.Phase_C_measurement: "PHASE_C_MEASUREMENT", + MeasurementType.DC_measurement: "DC_MEASUREMENT", + MeasurementType.Harmonics_measurement: "HARMONICS_MEASUREMENT", + MeasurementType.Power_quality_measurement: "POWER_QUALITY_MEASUREMENT", +} + +# SmartEnergy Metering device-type categorization. zigpy's `MeteringDeviceType` +# defines the values; ZHA groups them by physical metering type to pick the +# right device-status flag interpretation below. +METERING_DEVICE_TYPES_ELECTRIC: frozenset[int] = frozenset( + { + MeteringDeviceType.Electric_Metering, + MeteringDeviceType.EUMD_for_metering_electric_vehicle_charging, + MeteringDeviceType.PV_Generation_Metering, + MeteringDeviceType.Wind_Turbine_Generation_Metering, + MeteringDeviceType.Water_Turbine_Generation_Metering, + MeteringDeviceType.Micro_Generation_Metering, + MeteringDeviceType.Electric_Metering_Element_Phase_1, + MeteringDeviceType.Electric_Metering_Element_Phase_2, + MeteringDeviceType.Electric_Metering_Element_Phase_3, + MeteringDeviceType.Mirrored_Electric_Metering, + MeteringDeviceType.Mirrored_EUMD_for_metering_electric_vehicle_charging, + MeteringDeviceType.Mirrored_PV_Generation_Metering, + MeteringDeviceType.Mirrored_Wind_Turbine_Generation_Metering, + MeteringDeviceType.Mirrored_Water_Turbine_Generation_Metering, + MeteringDeviceType.Mirrored_Micro_Generation_Metering, + MeteringDeviceType.Mirrored_Electric_Metering_Element_Phase_1, + MeteringDeviceType.Mirrored_Electric_Metering_Element_Phase_2, + MeteringDeviceType.Mirrored_Electric_Metering_Element_Phase_3, + } +) +METERING_DEVICE_TYPES_GAS: frozenset[int] = frozenset( + {MeteringDeviceType.Gas_Metering, MeteringDeviceType.Mirrored_Gas_Metering} +) +METERING_DEVICE_TYPES_WATER: frozenset[int] = frozenset( + {MeteringDeviceType.Water_Metering, MeteringDeviceType.Mirrored_Water_Metering} +) +METERING_DEVICE_TYPES_HEATING_COOLING: frozenset[int] = frozenset( + { + MeteringDeviceType.Thermal_Metering, + MeteringDeviceType.Heat_Metering, + MeteringDeviceType.Cooling_Metering, + MeteringDeviceType.Mirrored_Thermal_Metering, + MeteringDeviceType.Mirrored_Heat_Metering, + MeteringDeviceType.Mirrored_Cooling_Metering, + } +) + + +def metering_device_type_name(dev_type: int) -> str | int: + """Return a human-readable label for a `MeteringDeviceType` value.""" + member = MeteringDeviceType._value2member_map_.get(dev_type) + return member.name.replace("_", " ") if member is not None else dev_type + + +# Per-metering-type interpretations of the `status` attribute. The ZCL spec +# reuses the same 8 status bits with different meanings depending on +# `metering_device_type`; zigpy's `MeteringStatus` covers only the Electric +# variant, so the rest are defined here. +class DeviceStatusElectric(enum.IntFlag): + """Electric Metering Device Status.""" + + NO_ALARMS = 0 + CHECK_METER = 1 + LOW_BATTERY = 2 + TAMPER_DETECT = 4 + POWER_FAILURE = 8 + POWER_QUALITY = 16 + LEAK_DETECT = 32 # Really? + SERVICE_DISCONNECT = 64 + RESERVED = 128 + + +class DeviceStatusGas(enum.IntFlag): + """Gas Metering Device Status.""" + + NO_ALARMS = 0 + CHECK_METER = 1 + LOW_BATTERY = 2 + TAMPER_DETECT = 4 + NOT_DEFINED = 8 + LOW_PRESSURE = 16 + LEAK_DETECT = 32 + SERVICE_DISCONNECT = 64 + REVERSE_FLOW = 128 + + +class DeviceStatusWater(enum.IntFlag): + """Water Metering Device Status.""" + + NO_ALARMS = 0 + CHECK_METER = 1 + LOW_BATTERY = 2 + TAMPER_DETECT = 4 + PIPE_EMPTY = 8 + LOW_PRESSURE = 16 + LEAK_DETECT = 32 + SERVICE_DISCONNECT = 64 + REVERSE_FLOW = 128 + + +class DeviceStatusHeatingCooling(enum.IntFlag): + """Heating and Cooling Metering Device Status.""" + + NO_ALARMS = 0 + CHECK_METER = 1 + LOW_BATTERY = 2 + TAMPER_DETECT = 4 + TEMPERATURE_SENSOR = 8 + BURST_DETECT = 16 + LEAK_DETECT = 32 + SERVICE_DISCONNECT = 64 + REVERSE_FLOW = 128 + + +class DeviceStatusDefault(enum.IntFlag): + """Metering Device Status.""" + + NO_ALARMS = 0 diff --git a/zha/application/platforms/siren.py b/zha/application/platforms/siren.py index eb2a673fa..6075de551 100644 --- a/zha/application/platforms/siren.py +++ b/zha/application/platforms/siren.py @@ -6,43 +6,38 @@ import asyncio import contextlib from dataclasses import dataclass -from enum import IntFlag +from enum import Enum, IntFlag import functools -from typing import TYPE_CHECKING, Any, Final, cast +from typing import TYPE_CHECKING, Any, Final from zhaquirks.quirk_ids import SIREN_BASIC from zigpy.profiles import zha -from zigpy.zcl.clusters.security import IasWd - -from zha.application import Platform -from zha.application.const import ( - WARNING_DEVICE_MODE_BURGLAR, - WARNING_DEVICE_MODE_EMERGENCY, - WARNING_DEVICE_MODE_EMERGENCY_PANIC, - WARNING_DEVICE_MODE_FIRE, - WARNING_DEVICE_MODE_FIRE_PANIC, - WARNING_DEVICE_MODE_POLICE_PANIC, - WARNING_DEVICE_MODE_STOP, - WARNING_DEVICE_SOUND_HIGH, - WARNING_DEVICE_STROBE_HIGH, - WARNING_DEVICE_STROBE_NO, +from zigpy.zcl.clusters.security import ( + IasWd, + SirenLevel, + Squawk, + SquawkMode, Strobe, + StrobeLevel, + WarningMode, + WarningType, ) + +from zha.application import Platform from zha.application.platforms import ( BaseEntityInfo, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, PlatformEntity, PlatformFeatureGroup, register_entity, ) -from zha.zigbee.cluster_handlers.const import CLUSTER_HANDLER_IAS_WD -from zha.zigbee.cluster_handlers.security import IasWdClusterHandler if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint + DEFAULT_DURATION = 5 # seconds ATTR_AVAILABLE_TONES: Final[str] = "available_tones" @@ -115,6 +110,10 @@ async def async_turn_on( duration: int | None = None, tone: int | None = None, volume_level: int | None = None, + # These kwargs are ZHA extensions to the base HA entity signature + strobe: int | None = None, + strobe_duty_cycle: int | None = None, + strobe_intensity: int | None = None, ) -> None: """Turn on siren.""" @@ -122,22 +121,38 @@ async def async_turn_on( async def async_turn_off(self) -> None: """Turn off siren.""" + # This method is a ZHA extension to the base HA siren entity + @abstractmethod + async def async_squawk( + self, + *, + mode: SquawkMode, + strobe: int, + squawk_level: int, + ) -> None: + """Issue a brief squawk pulse.""" + class BaseZclSiren(BaseSiren, ABC): """Base class for ZHA IAS WD siren entities with shared ZCL logic.""" - _cluster_handler: IasWdClusterHandler _off_listener: asyncio.TimerHandle | None + _cluster_match = ClusterMatch( + server_clusters=frozenset({IasWd.cluster_id}), + ) + _server_cluster_config = { + IasWd.cluster_id: ClusterConfig( + bind=True, + ), + } def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Init ZCL siren base.""" - self._cluster_handler = cast(IasWdClusterHandler, cluster_handlers[0]) self._off_listener = None legacy_discovery_unique_id = ( @@ -149,9 +164,8 @@ def __init__( ) super().__init__( - cluster_handlers, - endpoint, - device, + endpoint=endpoint, + device=device, legacy_discovery_unique_id=legacy_discovery_unique_id, **kwargs, ) @@ -168,13 +182,34 @@ def _cancel_off_listener(self) -> None: async def async_turn_off(self) -> None: """Turn off siren.""" - await self._cluster_handler.issue_start_warning( - mode=WARNING_DEVICE_MODE_STOP, strobe=WARNING_DEVICE_STROBE_NO + warning = WarningType() + warning.mode = WarningMode.Stop + warning.strobe = Strobe.No_strobe + warning.level = SirenLevel.High_level_sound + await self._cluster.start_warning( + warning=warning, + warning_duration=5, + strobe_duty_cycle=0, + stobe_level=StrobeLevel.High_level_strobe, ) self._cancel_off_listener() self._attr_is_on = False self.maybe_emit_state_changed_event() + async def async_squawk( + self, + *, + mode: SquawkMode, + strobe: int, + squawk_level: int, + ) -> None: + """Issue an IAS WD squawk command.""" + squawk = Squawk() + squawk.mode = mode + squawk.strobe = strobe + squawk.level = squawk_level + await self._cluster.squawk(squawk=squawk) + def _async_set_off(self) -> None: """Set is_on to False and write HA state.""" self._attr_is_on = False @@ -189,20 +224,21 @@ class AdvancedSiren(BaseZclSiren): _attr_fallback_name: str = "Siren" _attr_primary_weight = 4 - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_IAS_WD}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({IasWd.cluster_id}), feature_priority=(PlatformFeatureGroup.SIREN, 0), ) + defaults: dict[type[Enum], Enum | None] + def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Init this siren.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) + super().__init__(endpoint=endpoint, device=device, **kwargs) self._attr_supported_features = ( SirenEntityFeature.TURN_ON | SirenEntityFeature.TURN_OFF @@ -211,12 +247,18 @@ def __init__( | SirenEntityFeature.TONES ) self._attr_available_tones: dict[int, str] = { - WARNING_DEVICE_MODE_BURGLAR: "Burglar", - WARNING_DEVICE_MODE_FIRE: "Fire", - WARNING_DEVICE_MODE_EMERGENCY: "Emergency", - WARNING_DEVICE_MODE_POLICE_PANIC: "Police Panic", - WARNING_DEVICE_MODE_FIRE_PANIC: "Fire Panic", - WARNING_DEVICE_MODE_EMERGENCY_PANIC: "Emergency Panic", + WarningMode.Burglar: "Burglar", + WarningMode.Fire: "Fire", + WarningMode.Emergency: "Emergency", + WarningMode.Police_Panic: "Police Panic", + WarningMode.Fire_Panic: "Fire Panic", + WarningMode.Emergency_Panic: "Emergency Panic", + } + self.defaults = { + WarningMode: None, + SirenLevel: None, + Strobe: None, + StrobeLevel: None, } async def async_turn_on( @@ -224,49 +266,59 @@ async def async_turn_on( duration: int | None = None, tone: int | None = None, volume_level: int | None = None, + # These kwargs are ZHA extensions to the base HA entity signature + strobe: int | None = None, + strobe_duty_cycle: int | None = None, + strobe_intensity: int | None = None, ) -> None: """Turn on siren.""" self._cancel_off_listener() - tone_cache = self._cluster_handler.data_cache.get( - IasWd.Warning.WarningMode.__name__ - ) + tone_default = self.defaults[WarningMode] siren_tone = ( - tone_cache.value - if tone_cache is not None - else WARNING_DEVICE_MODE_EMERGENCY - ) - siren_duration = DEFAULT_DURATION - level_cache = self._cluster_handler.data_cache.get( - IasWd.Warning.SirenLevel.__name__ + tone_default.value if tone_default is not None else WarningMode.Emergency ) + level_default = self.defaults[SirenLevel] siren_level = ( - level_cache.value if level_cache is not None else WARNING_DEVICE_SOUND_HIGH + level_default.value + if level_default is not None + else SirenLevel.High_level_sound ) - strobe_cache = self._cluster_handler.data_cache.get(Strobe.__name__) + strobe_default = self.defaults[Strobe] should_strobe = ( - strobe_cache.value if strobe_cache is not None else Strobe.No_Strobe - ) - strobe_level_cache = self._cluster_handler.data_cache.get( - IasWd.StrobeLevel.__name__ + strobe_default.value if strobe_default is not None else Strobe.No_strobe ) + strobe_level_default = self.defaults[StrobeLevel] strobe_level = ( - strobe_level_cache.value - if strobe_level_cache is not None - else WARNING_DEVICE_STROBE_HIGH + strobe_level_default.value + if strobe_level_default is not None + else StrobeLevel.High_level_strobe ) + siren_duration = DEFAULT_DURATION if duration is not None: siren_duration = duration if tone is not None: siren_tone = tone if volume_level is not None: siren_level = int(volume_level) - await self._cluster_handler.issue_start_warning( - mode=siren_tone, + if strobe is not None: + should_strobe = strobe + if strobe_intensity is not None: + strobe_level = strobe_intensity + duty_cycle = ( + strobe_duty_cycle + if strobe_duty_cycle is not None + else (50 if should_strobe else 0) + ) + + warning = WarningType() + warning.mode = siren_tone + warning.strobe = should_strobe + warning.level = siren_level + await self._cluster.start_warning( + warning=warning, warning_duration=siren_duration, - siren_level=siren_level, - strobe=should_strobe, - strobe_duty_cycle=50 if should_strobe else 0, - strobe_intensity=strobe_level, + strobe_duty_cycle=duty_cycle, + stobe_level=strobe_level, ) self._attr_is_on = True self._off_listener = asyncio.get_running_loop().call_later( @@ -283,21 +335,20 @@ class BasicSiren(BaseZclSiren): _attr_fallback_name: str = "Siren" _attr_primary_weight = 4 - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_IAS_WD}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({IasWd.cluster_id}), exposed_features=frozenset({SIREN_BASIC}), feature_priority=(PlatformFeatureGroup.SIREN, 1), ) def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Init this basic siren.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) + super().__init__(endpoint=endpoint, device=device, **kwargs) self._attr_supported_features = ( SirenEntityFeature.TURN_ON | SirenEntityFeature.TURN_OFF @@ -310,18 +361,25 @@ async def async_turn_on( duration: int | None = None, tone: int | None = None, volume_level: int | None = None, + # These kwargs are ZHA extensions to the base HA entity signature + strobe: int | None = None, + strobe_duty_cycle: int | None = None, + strobe_intensity: int | None = None, ) -> None: """Turn on siren with fixed tone, level, and strobe.""" self._cancel_off_listener() siren_duration = duration if duration is not None else DEFAULT_DURATION - await self._cluster_handler.issue_start_warning( - # some Frient sensors send INVALID_VALUE for EMERGENCY - mode=WARNING_DEVICE_MODE_BURGLAR, + + warning = WarningType() + # some Frient sensors send INVALID_VALUE for EMERGENCY + warning.mode = WarningMode.Burglar + warning.strobe = Strobe.No_strobe + warning.level = SirenLevel.High_level_sound + await self._cluster.start_warning( + warning=warning, warning_duration=siren_duration, - siren_level=WARNING_DEVICE_SOUND_HIGH, - strobe=WARNING_DEVICE_STROBE_NO, strobe_duty_cycle=0, - strobe_intensity=WARNING_DEVICE_STROBE_HIGH, + stobe_level=StrobeLevel.High_level_strobe, ) self._attr_is_on = True self._off_listener = asyncio.get_running_loop().call_later( diff --git a/zha/application/platforms/switch.py b/zha/application/platforms/switch.py index e4a6b4b11..e3d1899e8 100644 --- a/zha/application/platforms/switch.py +++ b/zha/application/platforms/switch.py @@ -6,21 +6,33 @@ from dataclasses import dataclass import functools import logging -from typing import TYPE_CHECKING, Any, cast +from typing import TYPE_CHECKING, Any from zhaquirks.quirk_ids import DANFOSS_ALLY_THERMOSTAT, TUYA_PLUG_ONOFF +from zigpy import types as t from zigpy.profiles import zha, zll -from zigpy.quirks.v2 import SwitchMetadata +from zigpy.quirks.v2 import EntityMetadata, SwitchMetadata +import zigpy.zcl +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, +) from zigpy.zcl.clusters.closures import ConfigStatus, WindowCovering, WindowCoveringMode from zigpy.zcl.clusters.general import Basic, BinaryOutput, OnOff from zigpy.zcl.clusters.hvac import Thermostat from zigpy.zcl.foundation import Status from zha.application import Platform +from zha.application.helpers import safe_read, write_attributes_safe from zha.application.platforms import ( + AttrConfig, BaseEntity, BaseEntityInfo, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, EntityCategory, GroupEntity, PlatformEntity, @@ -28,30 +40,18 @@ register_entity, register_group_entity, ) -from zha.application.platforms.light.const import LIGHT_PROFILE_DEVICE_TYPES -from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent -from zha.zigbee.cluster_handlers.const import ( +from zha.application.platforms.const import ( AQARA_OPPLE_CLUSTER, - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_BASIC, - CLUSTER_HANDLER_BINARY_OUTPUT, - CLUSTER_HANDLER_COVER, - CLUSTER_HANDLER_INOVELLI, - CLUSTER_HANDLER_ON_OFF, - CLUSTER_HANDLER_THERMOSTAT, IKEA_AIR_PURIFIER_CLUSTER, INOVELLI_CLUSTER, SINOPE_MANUFACTURER_CLUSTER, TUYA_MANUFACTURER_CLUSTER, ) -from zha.zigbee.cluster_handlers.general import ( - BinaryOutputClusterHandler, - OnOffClusterHandler, -) +from zha.application.platforms.light.const import LIGHT_PROFILE_DEVICE_TYPES +from zha.exceptions import ZHAException from zha.zigbee.group import Group if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device from zha.zigbee.endpoint import Endpoint @@ -103,15 +103,31 @@ class Switch(PlatformEntity, BaseSwitch): _attr_primary_weight = 10 _attribute_name = OnOff.AttributeDefs.on_off.name - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OnOff.cluster_id}), # Switch entities have the lowest priority feature_priority=(PlatformFeatureGroup.LIGHT_OR_SWITCH_OR_SHADE, -1), ) + _server_cluster_config = { + OnOff.cluster_id: ClusterConfig( + bind=True, + attributes={ + OnOff.AttributeDefs.on_off: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + OnOff.AttributeDefs.start_up_on_off: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, @@ -140,47 +156,54 @@ def __init__( ) super().__init__( - cluster_handlers, - endpoint, - device, + endpoint=endpoint, + device=device, **kwargs, legacy_discovery_unique_id=legacy_discovery_unique_id, ) - self._on_off_cluster_handler: OnOffClusterHandler = cast( - OnOffClusterHandler, self.cluster_handlers[CLUSTER_HANDLER_ON_OFF] - ) + self._cluster = endpoint.zigpy_endpoint.in_clusters[OnOff.cluster_id] @property def is_on(self) -> bool: """Return if the switch is on based on the statemachine.""" - if self._on_off_cluster_handler.on_off is None: + value = self._cluster.get(OnOff.AttributeDefs.on_off.name) + if value is None: return False - return self._on_off_cluster_handler.on_off + return value async def async_turn_on(self) -> None: """Turn the entity on.""" - await self._on_off_cluster_handler.turn_on() + result = await self._cluster.on() + if result[1] is not Status.SUCCESS: + raise ZHAException(f"Failed to turn on: {result[1]}") + self._cluster.update_attribute(OnOff.AttributeDefs.on_off.id, t.Bool.true) self.maybe_emit_state_changed_event() async def async_turn_off(self) -> None: """Turn the entity off.""" - await self._on_off_cluster_handler.turn_off() + result = await self._cluster.off() + if result[1] is not Status.SUCCESS: + raise ZHAException(f"Failed to turn off: {result[1]}") + self._cluster.update_attribute(OnOff.AttributeDefs.on_off.id, t.Bool.false) self.maybe_emit_state_changed_event() def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._on_off_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) def _is_supported(self) -> bool: - if self._on_off_cluster_handler.cluster.is_attribute_unsupported( - self._attribute_name - ): + if self._cluster.is_attribute_unsupported(self._attribute_name): _LOGGER.debug( "%s is not supported - skipping %s entity creation", self._attribute_name, @@ -190,40 +213,57 @@ def _is_supported(self) -> bool: return super()._is_supported() - def handle_cluster_handler_attribute_updated( + def handle_attribute_updated( self, - event: ClusterAttributeUpdatedEvent, # pylint: disable=unused-argument + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: - """Handle state update from cluster handler.""" + """Handle state update from cluster.""" if event.attribute_name == self._attribute_name: self.maybe_emit_state_changed_event() + async def async_update(self) -> None: + """Retrieve latest state.""" + self.debug("polling current state") + await safe_read( + self._cluster, + [self._attribute_name], + allow_cache=False, + only_cache=False, + ) + self.maybe_emit_state_changed_event() + @register_entity(BinaryOutput.cluster_id) class BinaryOutputSwitch(PlatformEntity, BaseSwitch): """BinaryOutputCluster switch.""" _attr_primary_weight = 10 - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_BINARY_OUTPUT}) + _cluster_match = ClusterMatch( + server_clusters=frozenset({BinaryOutput.cluster_id}), ) - def __init__( - self, - cluster_handlers: list[ClusterHandler], - endpoint: Endpoint, - device: Device, - **kwargs: Any, - ) -> None: - """Initialize the switch.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) - self._binary_output_cluster_handler: BinaryOutputClusterHandler = cast( - BinaryOutputClusterHandler, - self.cluster_handlers[CLUSTER_HANDLER_BINARY_OUTPUT], - ) + _server_cluster_config = { + BinaryOutput.cluster_id: ClusterConfig( + bind=True, + attributes={ + BinaryOutput.AttributeDefs.present_value: AttrConfig( + read_on_startup=True, + reporting=ReportingConfig( + min_interval=0, max_interval=900, reportable_change=1 + ), + ), + BinaryOutput.AttributeDefs.description: AttrConfig( + read_on_startup=False, + ), + }, + ), + } def _is_supported(self) -> bool: - if self._binary_output_cluster_handler.description is None: + if self._cluster.get(BinaryOutput.AttributeDefs.description.name) is None: return False return super()._is_supported() @@ -231,43 +271,69 @@ def _is_supported(self) -> bool: def recompute_capabilities(self) -> None: """Recompute capabilities.""" super().recompute_capabilities() - self._attr_fallback_name = self._binary_output_cluster_handler.description + self._attr_fallback_name = self._cluster.get( + BinaryOutput.AttributeDefs.description.name + ) def on_add(self) -> None: """Run when entity is added.""" super().on_add() - self._on_remove_callbacks.append( - self._binary_output_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) @property def is_on(self) -> bool: """Return if the switch is on.""" - if self._binary_output_cluster_handler.present_value is None: + value = self._cluster.get(BinaryOutput.AttributeDefs.present_value.name) + if value is None: return False - return bool(self._binary_output_cluster_handler.present_value) + return bool(value) async def async_turn_on(self) -> None: """Turn the entity on.""" - await self._binary_output_cluster_handler.async_set_present_value(True) + await write_attributes_safe( + self._cluster, {BinaryOutput.AttributeDefs.present_value.name: True} + ) self.maybe_emit_state_changed_event() async def async_turn_off(self) -> None: """Turn the entity off.""" - await self._binary_output_cluster_handler.async_set_present_value(False) + await write_attributes_safe( + self._cluster, {BinaryOutput.AttributeDefs.present_value.name: False} + ) self.maybe_emit_state_changed_event() - def handle_cluster_handler_attribute_updated( + def handle_attribute_updated( self, - event: ClusterAttributeUpdatedEvent, # pylint: disable=unused-argument + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: - """Handle state update from cluster handler.""" + """Handle state update from cluster.""" if event.attribute_name == BinaryOutput.AttributeDefs.present_value.name: self.maybe_emit_state_changed_event() + async def async_update(self) -> None: + """Retrieve latest state.""" + self.debug("polling current state") + await safe_read( + self._cluster, + [BinaryOutput.AttributeDefs.present_value.name], + allow_cache=False, + only_cache=False, + ) + self.maybe_emit_state_changed_event() + @register_group_entity class SwitchGroup(GroupEntity, BaseSwitch): @@ -279,7 +345,7 @@ def __init__(self, group: Group): """Initialize a switch group.""" super().__init__(group) self._state: bool - self._on_off_cluster_handler = group.zigpy_group.endpoint[OnOff.cluster_id] + self._cluster = group.zigpy_group.endpoint[OnOff.cluster_id] if hasattr(self, "info_object"): delattr(self, "info_object") self.update() @@ -291,7 +357,7 @@ def is_on(self) -> bool: async def async_turn_on(self) -> None: """Turn the entity on.""" - result = await self._on_off_cluster_handler.on() + result = await self._cluster.on() if result[1] is not Status.SUCCESS: return self._state = True @@ -299,7 +365,7 @@ async def async_turn_on(self) -> None: async def async_turn_off(self) -> None: """Turn the entity off.""" - result = await self._on_off_cluster_handler.off() + result = await self._cluster.off() if result[1] is not Status.SUCCESS: return self._state = False @@ -334,17 +400,16 @@ class ConfigurableAttributeSwitch(PlatformEntity): def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, *, + cluster: zigpy.zcl.Cluster, + entity_metadata: EntityMetadata | None = None, legacy_discovery_unique_id: str | None = None, **kwargs: Any, ) -> None: """Init this number configuration entity.""" - self._cluster_handler: ClusterHandler = cluster_handlers[0] - - if legacy_discovery_unique_id is None: + if legacy_discovery_unique_id is None and entity_metadata is None: legacy_discovery_unique_id = ( f"{endpoint.device.ieee}-{endpoint.id}" if ( @@ -357,20 +422,32 @@ def __init__( (zha.PROFILE_ID, zha.DeviceType.SMART_PLUG), (zll.PROFILE_ID, zll.DeviceType.ON_OFF_PLUGIN_UNIT), } - else f"{endpoint.device.ieee}-{endpoint.id}-{int(cluster_handlers[0].cluster.cluster_id)}" + else f"{endpoint.device.ieee}-{endpoint.id}-{int(cluster.cluster_id)}" ) super().__init__( - cluster_handlers, - endpoint, - device, - **kwargs, + endpoint=endpoint, + device=device, + cluster=cluster, + entity_metadata=entity_metadata, legacy_discovery_unique_id=legacy_discovery_unique_id, + **kwargs, ) - self._cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, - ) + + def on_add(self) -> None: + """Run when entity is added.""" + super().on_add() + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) + ) def _init_from_quirks_metadata(self, entity_metadata: SwitchMetadata) -> None: """Init this entity from the quirks metadata.""" @@ -385,11 +462,9 @@ def _init_from_quirks_metadata(self, entity_metadata: SwitchMetadata) -> None: def _is_supported(self) -> bool: if ( - self._attribute_name not in self._cluster_handler.cluster.attributes_by_name - or self._cluster_handler.cluster.is_attribute_unsupported( - self._attribute_name - ) - or self._cluster_handler.cluster.get(self._attribute_name) is None + self._attribute_name not in self._cluster.attributes_by_name + or self._cluster.is_attribute_unsupported(self._attribute_name) + or self._cluster.get(self._attribute_name) is None ): _LOGGER.debug( "%s is not supported - skipping %s entity creation", @@ -424,26 +499,27 @@ def state(self) -> dict[str, Any]: def inverted(self) -> bool: """Return True if the switch is inverted.""" if self._inverter_attribute_name: - return bool( - self._cluster_handler.cluster.get(self._inverter_attribute_name) - ) + return bool(self._cluster.get(self._inverter_attribute_name)) return self._force_inverted @property def is_on(self) -> bool: """Return if the switch is on based on the statemachine.""" if self._on_value != 1: - val = self._cluster_handler.cluster.get(self._attribute_name) + val = self._cluster.get(self._attribute_name) val = val == self._on_value else: - val = bool(self._cluster_handler.cluster.get(self._attribute_name)) + val = bool(self._cluster.get(self._attribute_name)) return (not val) if self.inverted else val - def handle_cluster_handler_attribute_updated( + def handle_attribute_updated( self, - event: ClusterAttributeUpdatedEvent, # pylint: disable=unused-argument + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: - """Handle state update from cluster handler.""" + """Handle state update from cluster.""" if event.attribute_name == self._attribute_name: self.maybe_emit_state_changed_event() @@ -452,12 +528,12 @@ async def async_turn_on_off(self, state: bool) -> None: if self.inverted: state = not state if state: - await self._cluster_handler.write_attributes_safe( - {self._attribute_name: self._on_value} + await write_attributes_safe( + self._cluster, {self._attribute_name: self._on_value} ) else: - await self._cluster_handler.write_attributes_safe( - {self._attribute_name: self._off_value} + await write_attributes_safe( + self._cluster, {self._attribute_name: self._off_value} ) self.maybe_emit_state_changed_event() @@ -477,8 +553,8 @@ async def async_update(self) -> None: if self._inverter_attribute_name: polling_attrs.append(self._inverter_attribute_name) - results = await self._cluster_handler.get_attributes( - polling_attrs, from_cache=False, only_cache=False + results = await safe_read( + self._cluster, polling_attrs, allow_cache=False, only_cache=False ) self.debug("read values=%s", results) @@ -493,9 +569,10 @@ class OnOffWindowDetectionFunctionConfigurationEntity(ConfigurableAttributeSwitc _attribute_name = "window_detection_function" _inverter_attribute_name = "window_detection_function_inverter" _attr_translation_key = "window_detection_function" + _cluster_id = TUYA_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"tuya_manufacturer"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({TUYA_MANUFACTURER_CLUSTER}), manufacturers=frozenset({"_TZE200_b6wax7g0"}), ) @@ -507,9 +584,10 @@ class P1MotionTriggerIndicatorSwitch(ConfigurableAttributeSwitch): _unique_id_suffix = "trigger_indicator" _attribute_name = "trigger_indicator" _attr_translation_key = "trigger_indicator" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.motion.ac02"}), ) @@ -521,9 +599,10 @@ class XiaomiPlugPowerOutageMemorySwitch(ConfigurableAttributeSwitch): _unique_id_suffix = "power_outage_memory" _attribute_name = "power_outage_memory" _attr_translation_key = "power_outage_memory" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.plug.mmeu01", "lumi.plug.maeu01"}), ) @@ -535,13 +614,22 @@ class HueMotionTriggerIndicatorSwitch(ConfigurableAttributeSwitch): _unique_id_suffix = "trigger_indicator" _attribute_name = "trigger_indicator" _attr_translation_key = "trigger_indicator" + _cluster_id = Basic.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_BASIC}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Basic.cluster_id}), manufacturers=frozenset({"Philips", "Signify Netherlands B.V."}), models=frozenset({"SML001", "SML002", "SML003", "SML004"}), ) + _server_cluster_config = { + Basic.cluster_id: ClusterConfig( + attributes={ + "trigger_indicator": AttrConfig(read_on_startup=False), + }, + ), + } + @register_entity(IKEA_AIR_PURIFIER_CLUSTER) class ChildLock(ConfigurableAttributeSwitch): @@ -550,9 +638,10 @@ class ChildLock(ConfigurableAttributeSwitch): _unique_id_suffix = "child_lock" _attribute_name = "child_lock" _attr_translation_key = "child_lock" + _cluster_id = IKEA_AIR_PURIFIER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"ikea_airpurifier"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({IKEA_AIR_PURIFIER_CLUSTER}), models=frozenset({"STARKVIND Air purifier", "STARKVIND Air purifier table"}), ) @@ -564,9 +653,10 @@ class DisableLed(ConfigurableAttributeSwitch): _unique_id_suffix = "disable_led" _attribute_name = "disable_led" _attr_translation_key = "disable_led" + _cluster_id = IKEA_AIR_PURIFIER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"ikea_airpurifier"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({IKEA_AIR_PURIFIER_CLUSTER}), models=frozenset({"STARKVIND Air purifier", "STARKVIND Air purifier table"}), ) @@ -579,8 +669,10 @@ class InovelliInvertSwitch(ConfigurableAttributeSwitch): _attribute_name = "invert_switch" _attr_translation_key = "invert_switch" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -592,8 +684,10 @@ class InovelliSmartBulbMode(ConfigurableAttributeSwitch): _attribute_name = "smart_bulb_mode" _attr_translation_key = "smart_bulb_mode" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -605,8 +699,10 @@ class InovelliSmartFanMode(ConfigurableAttributeSwitch): _attribute_name = "smart_fan_mode" _attr_translation_key = "smart_fan_mode" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), models=frozenset({"VZM35-SN"}), ) @@ -619,8 +715,10 @@ class InovelliDoubleTapUpEnabled(ConfigurableAttributeSwitch): _attribute_name = "double_tap_up_enabled" _attr_translation_key = "double_tap_up_enabled" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -632,8 +730,10 @@ class InovelliDoubleTapDownEnabled(ConfigurableAttributeSwitch): _attribute_name = "double_tap_down_enabled" _attr_translation_key = "double_tap_down_enabled" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -645,8 +745,10 @@ class InovelliAuxSwitchScenes(ConfigurableAttributeSwitch): _attribute_name = "aux_switch_scenes" _attr_translation_key = "aux_switch_scenes" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -658,8 +760,10 @@ class InovelliBindingOffToOnSyncLevel(ConfigurableAttributeSwitch): _attribute_name = "binding_off_to_on_sync_level" _attr_translation_key = "binding_off_to_on_sync_level" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -671,8 +775,10 @@ class InovelliLocalProtection(ConfigurableAttributeSwitch): _attribute_name = "local_protection" _attr_translation_key = "local_protection" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -684,8 +790,10 @@ class InovelliOnOffLEDMode(ConfigurableAttributeSwitch): _attribute_name = "on_off_led_mode" _attr_translation_key = "one_led_mode" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -697,8 +805,10 @@ class InovelliFirmwareProgressLED(ConfigurableAttributeSwitch): _attribute_name = "firmware_progress_led" _attr_translation_key = "firmware_progress_led" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -710,8 +820,10 @@ class InovelliRelayClickInOnOffMode(ConfigurableAttributeSwitch): _attribute_name = "relay_click_in_on_off_mode" _attr_translation_key = "relay_click_in_on_off_mode" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -723,8 +835,10 @@ class InovelliDisableDoubleTapClearNotificationsMode(ConfigurableAttributeSwitch _attribute_name = "disable_clear_notifications_double_tap" _attr_translation_key = "disable_clear_notifications_double_tap" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_INOVELLI}), + _cluster_id = INOVELLI_CLUSTER + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), ) @@ -736,9 +850,10 @@ class AqaraPetFeederLEDIndicator(ConfigurableAttributeSwitch): _attribute_name = "disable_led_indicator" _attr_translation_key = "led_indicator" _force_inverted = True + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"aqara.feeder.acn001"}), ) @@ -750,9 +865,10 @@ class AqaraPetFeederChildLock(ConfigurableAttributeSwitch): _unique_id_suffix = "child_lock" _attribute_name = "child_lock" _attr_translation_key = "child_lock" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"aqara.feeder.acn001"}), ) @@ -764,12 +880,22 @@ class TuyaChildLockSwitch(ConfigurableAttributeSwitch): _unique_id_suffix = "child_lock" _attribute_name = "child_lock" _attr_translation_key = "child_lock" + _cluster_id = OnOff.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_ON_OFF}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({OnOff.cluster_id}), exposed_features=frozenset({TUYA_PLUG_ONOFF}), ) + _server_cluster_config = { + OnOff.cluster_id: ClusterConfig( + bind=True, + attributes={ + "child_lock": AttrConfig(read_on_startup=False), + }, + ), + } + @register_entity(AQARA_OPPLE_CLUSTER) class AqaraThermostatWindowDetection(ConfigurableAttributeSwitch): @@ -778,9 +904,10 @@ class AqaraThermostatWindowDetection(ConfigurableAttributeSwitch): _unique_id_suffix = "window_detection" _attribute_name = "window_detection" _attr_translation_key = "window_detection" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.airrtc.agl001"}), ) @@ -792,9 +919,10 @@ class AqaraThermostatValveDetection(ConfigurableAttributeSwitch): _unique_id_suffix = "valve_detection" _attribute_name = "valve_detection" _attr_translation_key = "valve_detection" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.airrtc.agl001"}), ) @@ -806,9 +934,10 @@ class AqaraThermostatChildLock(ConfigurableAttributeSwitch): _unique_id_suffix = "child_lock" _attribute_name = "child_lock" _attr_translation_key = "child_lock" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.airrtc.agl001"}), ) @@ -820,9 +949,10 @@ class AqaraHeartbeatIndicator(ConfigurableAttributeSwitch): _unique_id_suffix = "heartbeat_indicator" _attribute_name = "heartbeat_indicator" _attr_translation_key = "heartbeat_indicator" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.sensor_smoke.acn03"}), ) @@ -834,9 +964,10 @@ class AqaraLinkageAlarm(ConfigurableAttributeSwitch): _unique_id_suffix = "linkage_alarm" _attribute_name = "linkage_alarm" _attr_translation_key = "linkage_alarm" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.sensor_smoke.acn03"}), ) @@ -848,9 +979,10 @@ class AqaraBuzzerManualMute(ConfigurableAttributeSwitch): _unique_id_suffix = "buzzer_manual_mute" _attribute_name = "buzzer_manual_mute" _attr_translation_key = "buzzer_manual_mute" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.sensor_smoke.acn03"}), ) @@ -862,9 +994,10 @@ class AqaraBuzzerManualAlarm(ConfigurableAttributeSwitch): _unique_id_suffix = "buzzer_manual_alarm" _attribute_name = "buzzer_manual_alarm" _attr_translation_key = "buzzer_manual_alarm" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.sensor_smoke.acn03"}), ) @@ -879,11 +1012,26 @@ class WindowCoveringInversionSwitch(ConfigurableAttributeSwitch): _unique_id_suffix = "inverted" _attribute_name = WindowCovering.AttributeDefs.config_status.name _attr_translation_key = "inverted" + _cluster_id = WindowCovering.cluster_id - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_COVER}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({WindowCovering.cluster_id}), ) + _server_cluster_config = { + WindowCovering.cluster_id: ClusterConfig( + bind=True, + attributes={ + WindowCovering.AttributeDefs.config_status: AttrConfig( + read_on_startup=False, + ), + WindowCovering.AttributeDefs.window_covering_mode: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def _is_supported(self) -> bool: window_covering_mode_attr = ( WindowCovering.AttributeDefs.window_covering_mode.name @@ -891,16 +1039,9 @@ def _is_supported(self) -> bool: # this entity needs a second attribute to function if ( - ( - self._cluster_handler.cluster.is_attribute_unsupported( - window_covering_mode_attr - ) - ) - or ( - window_covering_mode_attr - not in self._cluster_handler.cluster.attributes_by_name - ) - or self._cluster_handler.cluster.get(window_covering_mode_attr) is None + self._cluster.is_attribute_unsupported(window_covering_mode_attr) + or window_covering_mode_attr not in self._cluster.attributes_by_name + or self._cluster.get(window_covering_mode_attr) is None ): _LOGGER.debug( "%s is not supported - skipping %s entity creation", @@ -914,9 +1055,7 @@ def _is_supported(self) -> bool: @property def is_on(self) -> bool: """Return if the switch is on based on the statemachine.""" - config_status = ConfigStatus( - self._cluster_handler.cluster.get(self._attribute_name) - ) + config_status = ConfigStatus(self._cluster.get(self._attribute_name)) return ConfigStatus.Open_up_commands_reversed in config_status async def async_turn_on(self) -> None: @@ -930,12 +1069,13 @@ async def async_turn_off(self) -> None: async def async_update(self) -> None: """Attempt to retrieve the state of the entity.""" self.debug("Polling current state") - await self._cluster_handler.get_attributes( + await safe_read( + self._cluster, [ self._attribute_name, WindowCovering.AttributeDefs.window_covering_mode.name, ], - from_cache=False, + allow_cache=False, only_cache=False, ) self.maybe_emit_state_changed_event() @@ -943,9 +1083,7 @@ async def async_update(self) -> None: async def _async_on_off(self, invert: bool) -> None: """Turn the entity on or off.""" name: str = WindowCovering.AttributeDefs.window_covering_mode.name - current_mode: WindowCoveringMode = WindowCoveringMode( - self._cluster_handler.cluster.get(name) - ) + current_mode: WindowCoveringMode = WindowCoveringMode(self._cluster.get(name)) send_command: bool = False if invert and WindowCoveringMode.Motor_direction_reversed not in current_mode: current_mode |= WindowCoveringMode.Motor_direction_reversed @@ -954,7 +1092,7 @@ async def _async_on_off(self, invert: bool) -> None: current_mode &= ~WindowCoveringMode.Motor_direction_reversed send_command = True if send_command: - await self._cluster_handler.write_attributes_safe({name: current_mode}) + await write_attributes_safe(self._cluster, {name: current_mode}) await self.async_update() @@ -965,9 +1103,10 @@ class AqaraE1CurtainMotorHooksLockedSwitch(ConfigurableAttributeSwitch): _unique_id_suffix = "hooks_lock" _attribute_name = "hooks_lock" _attr_translation_key = "hooks_locked" + _cluster_id = AQARA_OPPLE_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"opple_cluster"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), models=frozenset({"lumi.curtain.agl001"}), ) @@ -980,11 +1119,22 @@ class DanfossExternalOpenWindowDetected(ConfigurableAttributeSwitch): _attribute_name: str = "external_open_window_detected" _attr_translation_key: str = "external_window_sensor" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_id = Thermostat.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "external_open_window_detected": AttrConfig(read_on_startup=False), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossWindowOpenFeature(ConfigurableAttributeSwitch): @@ -994,11 +1144,22 @@ class DanfossWindowOpenFeature(ConfigurableAttributeSwitch): _attribute_name: str = "window_open_feature" _attr_translation_key: str = "use_internal_window_detection" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_id = Thermostat.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "window_open_feature": AttrConfig(read_on_startup=False), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossMountingModeControl(ConfigurableAttributeSwitch): @@ -1008,11 +1169,22 @@ class DanfossMountingModeControl(ConfigurableAttributeSwitch): _attribute_name: str = "mounting_mode_control" _attr_translation_key: str = "mounting_mode" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_id = Thermostat.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "mounting_mode_control": AttrConfig(read_on_startup=False), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossRadiatorCovered(ConfigurableAttributeSwitch): @@ -1022,11 +1194,22 @@ class DanfossRadiatorCovered(ConfigurableAttributeSwitch): _attribute_name: str = "radiator_covered" _attr_translation_key: str = "prioritize_external_temperature_sensor" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_id = Thermostat.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "radiator_covered": AttrConfig(read_on_startup=False), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossHeatAvailable(ConfigurableAttributeSwitch): @@ -1036,11 +1219,22 @@ class DanfossHeatAvailable(ConfigurableAttributeSwitch): _attribute_name: str = "heat_available" _attr_translation_key: str = "heat_available" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_id = Thermostat.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "heat_available": AttrConfig(read_on_startup=False), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossLoadBalancingEnable(ConfigurableAttributeSwitch): @@ -1050,11 +1244,22 @@ class DanfossLoadBalancingEnable(ConfigurableAttributeSwitch): _attribute_name: str = "load_balancing_enable" _attr_translation_key: str = "use_load_balancing" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_id = Thermostat.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "load_balancing_enable": AttrConfig(read_on_startup=False), + }, + ), + } + @register_entity(Thermostat.cluster_id) class DanfossAdaptationRunSettings(ConfigurableAttributeSwitch): @@ -1067,11 +1272,22 @@ class DanfossAdaptationRunSettings(ConfigurableAttributeSwitch): _attribute_name: str = "adaptation_run_settings" _attr_translation_key: str = "adaptation_run_enabled" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_THERMOSTAT}), + _cluster_id = Thermostat.cluster_id + + _cluster_match = ClusterMatch( + server_clusters=frozenset({Thermostat.cluster_id}), exposed_features=frozenset({DANFOSS_ALLY_THERMOSTAT}), ) + _server_cluster_config = { + Thermostat.cluster_id: ClusterConfig( + bind=True, + attributes={ + "adaptation_run_settings": AttrConfig(read_on_startup=False), + }, + ), + } + @register_entity(SINOPE_MANUFACTURER_CLUSTER) class SinopeLightDoubleTapFullSwitch(ConfigurableAttributeSwitch): @@ -1080,8 +1296,9 @@ class SinopeLightDoubleTapFullSwitch(ConfigurableAttributeSwitch): _unique_id_suffix = "double_up_full" _attribute_name = "double_up_full" _attr_translation_key: str = "double_up_full" + _cluster_id = SINOPE_MANUFACTURER_CLUSTER - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({"sinope_manufacturer_specific"}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({SINOPE_MANUFACTURER_CLUSTER}), models=frozenset({"DM2500ZB", "DM2500ZB-G2", "DM2550ZB", "DM2550ZB-G2"}), ) diff --git a/zha/application/platforms/update.py b/zha/application/platforms/update.py index 38fcd0d52..cc7ce0a92 100644 --- a/zha/application/platforms/update.py +++ b/zha/application/platforms/update.py @@ -11,30 +11,32 @@ from typing import TYPE_CHECKING, Any, Final from zigpy.ota import OtaImagesResult, OtaImageWithMetadata -from zigpy.zcl import OtaImageAvailableEvent +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + OtaImageAvailableEvent, +) from zigpy.zcl.clusters.general import Ota from zigpy.zcl.foundation import Status from zha.application import Platform from zha.application.platforms import ( + AttrConfig, BaseEntityInfo, - ClusterHandlerMatch, + ClusterConfig, + ClusterMatch, EntityCategory, PlatformEntity, PlatformFeatureGroup, register_entity, ) from zha.exceptions import ZHAException -from zha.zigbee.cluster_handlers import ClusterAttributeUpdatedEvent -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_OTA, -) -from zha.zigbee.endpoint import Endpoint if TYPE_CHECKING: - from zha.zigbee.cluster_handlers import ClusterHandler from zha.zigbee.device import Device + from zha.zigbee.endpoint import Endpoint _LOGGER = logging.getLogger(__name__) @@ -170,13 +172,16 @@ def supported_features(self) -> UpdateEntityFeature: """Flag supported features.""" return self._attr_supported_features - def handle_cluster_handler_attribute_updated( + def handle_attribute_updated( self, - event: ClusterAttributeUpdatedEvent, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, ) -> None: """Handle attribute updates on the OTA cluster.""" if event.attribute_id == Ota.AttributeDefs.current_file_version.id: - self._attr_installed_version = f"0x{event.attribute_value:08x}" + self._attr_installed_version = f"0x{event.value:08x}" self.maybe_emit_state_changed_event() def _handle_ota_image_available( @@ -288,24 +293,29 @@ class FirmwareUpdateEntity(BaseFirmwareUpdateEntity): _unique_id_suffix = "firmware_update" - _cluster_handler_match = ClusterHandlerMatch( - client_cluster_handlers=frozenset({CLUSTER_HANDLER_OTA}), + _cluster_match = ClusterMatch( + client_clusters=frozenset({Ota.cluster_id}), feature_priority=(PlatformFeatureGroup.OTA_UPDATE, 1), ) + _client_cluster_config = { + Ota.cluster_id: ClusterConfig( + attributes={ + Ota.AttributeDefs.current_file_version: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + def __init__( self, - cluster_handlers: list[ClusterHandler], endpoint: Endpoint, device: Device, **kwargs: Any, ) -> None: """Initialize the ZHA update entity.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) - - self._ota_cluster_handler: ClusterHandler = self.cluster_handlers[ - CLUSTER_HANDLER_OTA - ] + super().__init__(endpoint=endpoint, device=device, **kwargs) self._attr_installed_version: str | None = self._get_cluster_version() self._compatible_images: OtaImagesResult = OtaImagesResult( upgrades=(), downgrades=() @@ -315,88 +325,54 @@ def on_add(self) -> None: """Call when entity is added.""" super().on_add() - ota_cluster = self._ota_cluster_handler.cluster - self._on_remove_callbacks.append( - self._ota_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + self._on_remove_callbacks.append( + self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) ) - ) self._on_remove_callbacks.append( - ota_cluster.on_event( + self._cluster.on_event( OtaImageAvailableEvent.event_type, self._handle_ota_image_available, ) ) # Check for cached OTA image availability from zigpy - ota_cluster.create_catching_task( - self.device.device.application.ota.check_cluster_for_ota(ota_cluster) + self._cluster.create_catching_task( + self.device.device.application.ota.check_cluster_for_ota(self._cluster) ) def _get_cluster_version(self) -> str | None: """Synchronize current file version with the cluster.""" - if self._ota_cluster_handler.current_file_version is not None: - return f"0x{self._ota_cluster_handler.current_file_version:08x}" + value = self._cluster.get(Ota.AttributeDefs.current_file_version.name) + if value is not None: + return f"0x{value:08x}" return None @register_entity(Ota.cluster_id) -class FirmwareUpdateServerEntity(BaseFirmwareUpdateEntity): - """Representation of a ZHA firmware update entity.""" +class FirmwareUpdateServerEntity(FirmwareUpdateEntity): + """Representation of a ZHA firmware update entity for devices exposing OTA as a server cluster.""" - _unique_id_suffix = "firmware_update" - _cluster_handler_match = ClusterHandlerMatch( - cluster_handlers=frozenset({CLUSTER_HANDLER_OTA}), + _cluster_match = ClusterMatch( + server_clusters=frozenset({Ota.cluster_id}), feature_priority=(PlatformFeatureGroup.OTA_UPDATE, 0), ) - def __init__( - self, - cluster_handlers: list[ClusterHandler], - endpoint: Endpoint, - device: Device, - **kwargs: Any, - ) -> None: - """Initialize the ZHA update entity.""" - super().__init__(cluster_handlers, endpoint, device, **kwargs) - - # Some devices make it a server cluster, not a client cluster... - self._ota_cluster_handler: ClusterHandler = self.cluster_handlers[ - CLUSTER_HANDLER_OTA - ] - self._attr_installed_version: str | None = self._get_cluster_version() - self._compatible_images: OtaImagesResult = OtaImagesResult( - upgrades=(), downgrades=() - ) - - def on_add(self) -> None: - """Call when entity is added.""" - super().on_add() - - ota_cluster = self._ota_cluster_handler.cluster - self._on_remove_callbacks.append( - self._ota_cluster_handler.on_event( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - self.handle_cluster_handler_attribute_updated, - ) - ) - self._on_remove_callbacks.append( - ota_cluster.on_event( - OtaImageAvailableEvent.event_type, - self._handle_ota_image_available, - ) - ) - - # Check for cached OTA image availability from zigpy - ota_cluster.create_catching_task( - self.device.device.application.ota.check_cluster_for_ota(ota_cluster) - ) - - def _get_cluster_version(self) -> str | None: - """Synchronize current file version with the cluster.""" - if self._ota_cluster_handler.current_file_version is not None: - return f"0x{self._ota_cluster_handler.current_file_version:08x}" - - return None + _server_cluster_config = { + Ota.cluster_id: ClusterConfig( + attributes={ + Ota.AttributeDefs.current_file_version: AttrConfig( + read_on_startup=False, + ), + }, + ), + } + _client_cluster_config = {} diff --git a/zha/application/platforms/virtual.py b/zha/application/platforms/virtual.py new file mode 100644 index 000000000..05c462014 --- /dev/null +++ b/zha/application/platforms/virtual.py @@ -0,0 +1,1245 @@ +"""Virtual platform entities. + +Virtual entities participate in cluster discovery and the cluster-config +aggregation flow (so they drive bind, attribute reporting, and cluster-level +setup work) but are filtered out before being registered as HA entities. They +host per-cluster background work like IAS Zone enrollment, LightLink +coordinator group joining, and client-cluster attribute cache synchronization. +""" + +from __future__ import annotations + +import asyncio +from typing import TYPE_CHECKING, Any + +from zhaquirks.quirk_ids import TUYA_PLUG_MANUFACTURER +import zigpy.exceptions +import zigpy.types as t +import zigpy.zcl +from zigpy.zcl import ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ReportingConfig, +) +from zigpy.zcl.clusters.closures import DoorLock, WindowCovering +from zigpy.zcl.clusters.general import Identify, LevelControl, OnOff, Ota, Scenes +from zigpy.zcl.clusters.lighting import Color +from zigpy.zcl.clusters.lightlink import LightLink +from zigpy.zcl.clusters.security import IasZone +from zigpy.zcl.foundation import GENERAL_COMMANDS, CommandSchema, GeneralCommand + +from zha.application import Platform +from zha.application.helpers import write_attributes_safe +from zha.application.platforms import ( + AttrConfig, + ClusterConfig, + ClusterMatch, + PlatformEntity, + register_entity, +) +from zha.application.platforms.const import ( + AQARA_OPPLE_CLUSTER, + IKEA_REMOTE_CLUSTER, + IKEA_SHORTCUT_V1_CLUSTER, + INOVELLI_CLUSTER, + OSRAM_CLUSTER, + PHILIPS_REMOTE_CLUSTER, + SINOPE_MANUFACTURER_CLUSTER, + SMARTTHINGS_ACCELERATION_CLUSTER, + SONOFF_CLUSTER, + TUYA_MANUFACTURER_CLUSTER, +) +from zha.exceptions import ZHAException +from zha.zigbee.endpoint import cluster_event_unique_id, split_event_arg + +ATTRIBUTE_ID = "attribute_id" +ATTRIBUTE_NAME = "attribute_name" +ATTRIBUTE_VALUE = "attribute_value" +SIGNAL_ATTR_UPDATED = "attribute_updated" +VALUE = "value" + +UNKNOWN = "Unknown" + +if TYPE_CHECKING: + from zha.zigbee.device import Device + from zha.zigbee.endpoint import Endpoint + + +class VirtualEntity(PlatformEntity): + """Cluster-level background driver that isn't registered as a HA entity. + + Virtual entities participate in discovery and cluster-config aggregation + (so they bind, configure reporting, and run cluster-level setup work like + IAS Zone enrollment) but the wrapping integration is expected to skip + registering them with Home Assistant. They have no state surface and + exist purely to drive cluster-level background work. + """ + + PLATFORM = Platform.VIRTUAL + _attr_always_supported = True + + def on_add(self) -> None: + """Subscribe to incoming cluster commands and attribute events.""" + super().on_add() + if hasattr(self, "cluster_command"): + self._cluster.add_listener(self) + self._on_remove_callbacks.append( + lambda: self._cluster.remove_listener(self) + ) + + if hasattr(self, "handle_attribute_updated"): + for event_type in ( + AttributeReadEvent, + AttributeReportedEvent, + AttributeUpdatedEvent, + AttributeWrittenEvent, + ): + unsub = self._cluster.on_event( + event_type.event_type, self.handle_attribute_updated + ) + self._on_remove_callbacks.append(unsub) + + def emit_cluster_zha_event( + self, command: str, arg: list | dict | CommandSchema | None = None + ) -> None: + """Relay a cluster-level zha_event via the endpoint.""" + args, params = split_event_arg(command, arg) + self._endpoint.emit_zha_event( + { + "unique_id": cluster_event_unique_id(self._endpoint, self._cluster), + "cluster_id": self._cluster.cluster_id, + "command": command, + "args": args, + "params": params, + } + ) + + +@register_entity(IasZone.cluster_id) +class IasZoneEnrollment(VirtualEntity): + """Drives the IAS Zone enrollment handshake. + + Writes the coordinator's IEEE to `cie_addr`, sends a pro-active enroll + response, replies to device-initiated enroll requests, and mirrors + status_change_notification commands into the `zone_status` attribute cache. + """ + + _unique_id_suffix = "ias_zone_enrollment" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({IasZone.cluster_id}), + ) + + _server_cluster_config = { + IasZone.cluster_id: ClusterConfig( + bind=True, + attributes={ + IasZone.AttributeDefs.zone_type: AttrConfig(read_on_startup=True), + }, + ), + } + + async def async_configure_cluster(self, cluster: zigpy.zcl.Cluster) -> None: + """Write CIE address and send the pro-active enroll response.""" + ieee = cluster.endpoint.device.application.state.node_info.ieee + + try: + await write_attributes_safe( + cluster, {IasZone.AttributeDefs.cie_addr.name: ieee} + ) + self.debug( + "wrote cie_addr: %s to '%s' cluster", str(ieee), cluster.ep_attribute + ) + except ZHAException as ex: + self.debug( + "Failed to write cie_addr to '%s' cluster: %s", + cluster.ep_attribute, + str(ex), + ) + + self.debug("Sending pro-active IAS enroll response") + cluster.create_catching_task( + cluster.enroll_response( + enroll_response_code=IasZone.EnrollResponse.Success, zone_id=0 + ) + ) + + def cluster_command(self, tsn: int, command_id: int, args: list[Any]) -> None: + """Handle incoming IAS Zone client commands.""" + if command_id == IasZone.ClientCommandDefs.status_change_notification.id: + zone_status = args[0] + self._cluster.update_attribute( + IasZone.AttributeDefs.zone_status.id, zone_status + ) + self.debug("Updated alarm state: %s", zone_status) + elif command_id == IasZone.ClientCommandDefs.enroll.id: + self.debug("Enroll requested") + self._cluster.create_catching_task( + self._cluster.enroll_response( + enroll_response_code=IasZone.EnrollResponse.Success, zone_id=0 + ) + ) + + +@register_entity(LightLink.cluster_id) +class LightLinkGroupJoin(VirtualEntity): + """Adds the coordinator to the device's LightLink groups.""" + + _unique_id_suffix = "lightlink_group_join" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({LightLink.cluster_id}), + ) + + _server_cluster_config = { + LightLink.cluster_id: ClusterConfig(bind=False), + } + + async def async_configure_cluster(self, cluster: zigpy.zcl.Cluster) -> None: + """Query the device's groups and add the coordinator to each.""" + application = cluster.endpoint.device.application + try: + coordinator = application.get_device(application.state.node_info.ieee) + except KeyError: + self.warning("Aborting - unable to locate required coordinator device.") + return + + try: + rsp = await cluster.get_group_identifiers(0) + except (zigpy.exceptions.ZigbeeException, TimeoutError) as exc: + self.warning("Couldn't get list of groups: %s", str(exc)) + return + + if isinstance(rsp, GENERAL_COMMANDS[GeneralCommand.Default_Response].schema): + groups = [] + else: + groups = rsp.group_info_records + + if groups: + for group in groups: + self.debug("Adding coordinator to 0x%04x group id", group.group_id) + await coordinator.add_to_group(group.group_id) + else: + await coordinator.add_to_group(0x0000, name="Lightlink Group") + + +@register_entity(OnOff.cluster_id) +class OnOffClientCacheSync(VirtualEntity): + """Mirrors incoming OnOff client commands to the server attribute cache. + + Lets `Opening`/`IkeaMotion`/`PhilipsMotion` binary sensors (which read the + server `on_off` cache) stay in sync with `off`/`on`/`toggle`/ + `on_with_timed_off` commands the device sends. + """ + + _unique_id_suffix = "on_off_client_cache_sync" + + _cluster_match = ClusterMatch( + client_clusters=frozenset({OnOff.cluster_id}), + match_renamed_clusters=True, + ) + + _client_cluster_config = { + OnOff.cluster_id: ClusterConfig(bind=True), + } + + def __init__( + self, + endpoint: Endpoint, + device: Device, + **kwargs: Any, + ) -> None: + """Initialize the OnOff client cache sync.""" + super().__init__(endpoint=endpoint, device=device, **kwargs) + self._off_listener: asyncio.TimerHandle | None = None + + async def on_remove(self) -> None: + """Cancel tasks and timers this entity owns.""" + if self._off_listener is not None: + self._off_listener.cancel() + self._off_listener = None + + await super().on_remove() + + @property + def on_off(self) -> bool | None: + """Return cached value of on/off attribute.""" + return self._cluster.get(OnOff.AttributeDefs.on_off.name) + + def cluster_command(self, tsn: int, command_id: int, args: list[Any]) -> None: + """Mirror commands from the device into the server cache + emit zha_event.""" + try: + cmd = self._cluster.server_commands[command_id].name + except KeyError: + return + + # Process the command into the cache first, so the resulting + # attribute_updated zha_event fires before the command zha_event. + if cmd in ( + OnOff.ServerCommandDefs.off.name, + OnOff.ServerCommandDefs.off_with_effect.name, + ): + self._cluster.update_attribute(OnOff.AttributeDefs.on_off.id, t.Bool.false) + elif cmd in ( + OnOff.ServerCommandDefs.on.name, + OnOff.ServerCommandDefs.on_with_recall_global_scene.name, + ): + self._cluster.update_attribute(OnOff.AttributeDefs.on_off.id, t.Bool.true) + elif cmd == OnOff.ServerCommandDefs.on_with_timed_off.name: + should_accept = args[0] + on_time = args[1] + if should_accept == 0 or (should_accept == 1 and bool(self.on_off)): + if self._off_listener is not None: + self._off_listener.cancel() + self._off_listener = None + self._cluster.update_attribute( + OnOff.AttributeDefs.on_off.id, t.Bool.true + ) + if on_time > 0: + self._off_listener = asyncio.get_running_loop().call_later( + on_time / 10, self._set_to_off + ) + elif cmd == "toggle": + self._cluster.update_attribute( + OnOff.AttributeDefs.on_off.id, not bool(self.on_off) + ) + + # Re-emit every incoming server command as a zha_event so HA + # automations can react to remote button presses. + self.emit_cluster_zha_event(cmd, args) + + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, + ) -> None: + """Relay attribute updates on this client cluster as zha_events.""" + self.emit_cluster_zha_event( + SIGNAL_ATTR_UPDATED, + { + ATTRIBUTE_ID: event.attribute_id, + ATTRIBUTE_NAME: event.attribute_name or UNKNOWN, + ATTRIBUTE_VALUE: event.value, + VALUE: event.value, + }, + ) + + def _set_to_off(self) -> None: + """Clear the on_off cache when the timed_off duration elapses.""" + self._off_listener = None + self._cluster.update_attribute(OnOff.AttributeDefs.on_off.id, t.Bool.false) + + +class _ClientClusterZhaEventEmitter(VirtualEntity): + """Bind a client cluster and emit zha_events for incoming commands/updates.""" + + def cluster_command(self, tsn: int, command_id: int, args: list[Any]) -> None: + """Relay incoming client cluster commands as zha_events.""" + if ( + self._cluster.server_commands is not None + and self._cluster.server_commands.get(command_id) is not None + ): + self.emit_cluster_zha_event( + self._cluster.server_commands[command_id].name, args + ) + + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, + ) -> None: + """Relay client cluster attribute updates as zha_events.""" + self.emit_cluster_zha_event( + SIGNAL_ATTR_UPDATED, + { + ATTRIBUTE_ID: event.attribute_id, + ATTRIBUTE_NAME: event.attribute_name or UNKNOWN, + ATTRIBUTE_VALUE: event.value, + VALUE: event.value, + }, + ) + + +@register_entity(Scenes.cluster_id) +class ScenesClientBind(_ClientClusterZhaEventEmitter): + """Bind the Scenes client cluster and emit zha_events for its commands.""" + + _unique_id_suffix = "scenes_client_bind" + + _cluster_match = ClusterMatch( + client_clusters=frozenset({Scenes.cluster_id}), + match_renamed_clusters=True, + ) + _client_cluster_config = { + Scenes.cluster_id: ClusterConfig(bind=True), + } + + +@register_entity(LevelControl.cluster_id) +class LevelControlClientBind(_ClientClusterZhaEventEmitter): + """Bind LevelControl client cluster and emit zha_events for its commands.""" + + _unique_id_suffix = "level_control_client_bind" + + _cluster_match = ClusterMatch( + client_clusters=frozenset({LevelControl.cluster_id}), + match_renamed_clusters=True, + profile_ids=None, + ) + _client_cluster_config = { + LevelControl.cluster_id: ClusterConfig(bind=True), + } + + +@register_entity(Color.cluster_id) +class ColorClientBind(_ClientClusterZhaEventEmitter): + """Bind the Color client cluster and emit zha_events for its commands.""" + + _unique_id_suffix = "color_client_bind" + + _cluster_match = ClusterMatch( + client_clusters=frozenset({Color.cluster_id}), + match_renamed_clusters=True, + ) + _client_cluster_config = { + Color.cluster_id: ClusterConfig(bind=True), + } + + +@register_entity(WindowCovering.cluster_id) +class WindowCoveringClientBind(_ClientClusterZhaEventEmitter): + """Bind WindowCovering client cluster and emit zha_events for its commands.""" + + _unique_id_suffix = "window_covering_client_bind" + + _cluster_match = ClusterMatch( + client_clusters=frozenset({WindowCovering.cluster_id}), + match_renamed_clusters=True, + ) + _client_cluster_config = { + WindowCovering.cluster_id: ClusterConfig(bind=True), + } + + +@register_entity(PHILIPS_REMOTE_CLUSTER) +class PhilipsRemoteBind(VirtualEntity): + """Bind the Philips remote cluster on every device that exposes it.""" + + _unique_id_suffix = "philips_remote_bind" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({PHILIPS_REMOTE_CLUSTER}), + ) + _server_cluster_config = { + PHILIPS_REMOTE_CLUSTER: ClusterConfig(bind=True), + } + + +@register_entity(OSRAM_CLUSTER) +class OsramClusterBind(VirtualEntity): + """Bind the Osram manufacturer cluster on every device that exposes it.""" + + _unique_id_suffix = "osram_cluster_bind" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({OSRAM_CLUSTER}), + ) + _server_cluster_config = { + OSRAM_CLUSTER: ClusterConfig(bind=True), + } + + +@register_entity(Ota.cluster_id) +class OtaCurrentFileVersionCache(VirtualEntity): + """Updates `current_file_version` on every query_next_image from the device.""" + + _unique_id_suffix = "ota_current_file_version_cache" + + _cluster_match = ClusterMatch( + client_clusters=frozenset({Ota.cluster_id}), + ) + + _client_cluster_config = { + Ota.cluster_id: ClusterConfig(bind=False), + } + + def cluster_command(self, tsn: int, command_id: int, args: list[Any]) -> None: + """Capture current_file_version from query_next_image.""" + if command_id not in self._cluster.server_commands: + return + cmd_name = self._cluster.server_commands[command_id].name + if cmd_name == Ota.ServerCommandDefs.query_next_image.name: + self._cluster.update_attribute( + Ota.AttributeDefs.current_file_version.id, args[3] + ) + + +@register_entity(DoorLock.cluster_id) +class DoorLockOperationEvent(VirtualEntity): + """Emits zha_event for DoorLock operation_event_notification commands.""" + + _unique_id_suffix = "door_lock_operation_event" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({DoorLock.cluster_id}), + ) + + _server_cluster_config = { + DoorLock.cluster_id: ClusterConfig(bind=False), + } + + def cluster_command(self, tsn: int, command_id: int, args: list[Any]) -> None: + """Translate operation_event_notification into a zha_event.""" + if ( + self._cluster.client_commands is None + or self._cluster.client_commands.get(command_id) is None + ): + return + + command_name = self._cluster.client_commands[command_id].name + if command_name != DoorLock.ClientCommandDefs.operation_event_notification.name: + return + + self.emit_cluster_zha_event( + command_name, + { + "source": args[0].name, + "operation": args[1].name, + "code_slot": (args[2] + 1), + }, + ) + + +@register_entity(SMARTTHINGS_ACCELERATION_CLUSTER) +class SmartThingsAccelerationEvent(VirtualEntity): + """Emits a zha_event for every attribute update on the SmartThings accel cluster.""" + + _unique_id_suffix = "smartthings_acceleration_event" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({SMARTTHINGS_ACCELERATION_CLUSTER}), + manufacturers=frozenset({"CentraLite", "Samjin", "SmartThings"}), + ) + + _server_cluster_config = { + SMARTTHINGS_ACCELERATION_CLUSTER: ClusterConfig(bind=False), + } + + def handle_attribute_updated( + self, + event: AttributeReadEvent + | AttributeReportedEvent + | AttributeUpdatedEvent + | AttributeWrittenEvent, + ) -> None: + """Re-emit the update as a zha_event.""" + self.emit_cluster_zha_event( + SIGNAL_ATTR_UPDATED, + { + ATTRIBUTE_ID: event.attribute_id, + ATTRIBUTE_NAME: event.attribute_name or UNKNOWN, + ATTRIBUTE_VALUE: event.value, + }, + ) + + +@register_entity(Identify.cluster_id) +class IdentifyTriggerEffectEvent(VirtualEntity): + """Emits a zha_event when the device sends `trigger_effect`.""" + + _unique_id_suffix = "identify_trigger_effect_event" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({Identify.cluster_id}), + ) + + _server_cluster_config = { + Identify.cluster_id: ClusterConfig(bind=False), + } + + def cluster_command(self, tsn: int, command_id: int, args: list[Any]) -> None: + """Translate trigger_effect into a zha_event.""" + try: + cmd = self._cluster.server_commands[command_id].name + except KeyError: + return + if cmd == Identify.ServerCommandDefs.trigger_effect.name: + self.emit_cluster_zha_event( + f"{cluster_event_unique_id(self._endpoint, self._cluster)}_{cmd}", + [args[0]], + ) + + +# === Aqara Opple cluster per-model attribute initialization === +# +# Each virtual entity below targets a specific Aqara model and declares the +# Opple attributes that should be populated in the attribute cache on startup +# so the regular entities (select/switch/sensor/number) reading them have a +# value to display. + + +class _AqaraOppleInitBase(VirtualEntity): + """Base for per-model Aqara Opple cluster attribute initialization.""" + + _unique_id_suffix = "aqara_opple_init" + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraOppleBind(VirtualEntity): + """Bind the Aqara Opple cluster on every device that exposes it.""" + + _unique_id_suffix = "aqara_opple_bind" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + ) + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig(bind=True), + } + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraMotionAc02Init(_AqaraOppleInitBase): + """Aqara P1 motion sensor attribute init.""" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + models=frozenset({"lumi.motion.ac02"}), + ) + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig( + attributes={ + "detection_interval": AttrConfig(read_on_startup=False), + "motion_sensitivity": AttrConfig(read_on_startup=False), + "trigger_indicator": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraMotionAgl04Init(_AqaraOppleInitBase): + """Aqara high-precision motion sensor attribute init.""" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + models=frozenset({"lumi.motion.agl04"}), + ) + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig( + attributes={ + "detection_interval": AttrConfig(read_on_startup=False), + "motion_sensitivity": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraMotionAc01Init(_AqaraOppleInitBase): + """Aqara FP1 presence sensor attribute init.""" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + models=frozenset({"lumi.motion.ac01"}), + ) + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig( + attributes={ + "presence": AttrConfig(read_on_startup=False), + "monitoring_mode": AttrConfig(read_on_startup=False), + "motion_sensitivity": AttrConfig(read_on_startup=False), + "approach_distance": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraPlugInit(_AqaraOppleInitBase): + """Aqara EU plug attribute init.""" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + models=frozenset({"lumi.plug.mmeu01", "lumi.plug.maeu01"}), + ) + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig( + attributes={ + "power_outage_memory": AttrConfig(read_on_startup=False), + "consumer_connected": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraFeederInit(_AqaraOppleInitBase): + """Aqara pet feeder attribute init.""" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + models=frozenset({"aqara.feeder.acn001"}), + ) + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig( + attributes={ + "portions_dispensed": AttrConfig(read_on_startup=False), + "weight_dispensed": AttrConfig(read_on_startup=False), + "error_detected": AttrConfig(read_on_startup=False), + "disable_led_indicator": AttrConfig(read_on_startup=False), + "child_lock": AttrConfig(read_on_startup=False), + "feeding_mode": AttrConfig(read_on_startup=False), + "serving_size": AttrConfig(read_on_startup=False), + "portion_weight": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraThermostatAgl001Init(_AqaraOppleInitBase): + """Aqara E1 radiator thermostat attribute init.""" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + models=frozenset({"lumi.airrtc.agl001"}), + ) + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig( + attributes={ + "system_mode": AttrConfig(read_on_startup=False), + "preset": AttrConfig(read_on_startup=False), + "window_detection": AttrConfig(read_on_startup=False), + "valve_detection": AttrConfig(read_on_startup=False), + "valve_alarm": AttrConfig(read_on_startup=False), + "child_lock": AttrConfig(read_on_startup=False), + "away_preset_temperature": AttrConfig(read_on_startup=False), + "window_open": AttrConfig(read_on_startup=False), + "calibrated": AttrConfig(read_on_startup=False), + "schedule": AttrConfig(read_on_startup=False), + "sensor": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraSmokeAcn03Init(_AqaraOppleInitBase): + """Aqara smoke sensor attribute init.""" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + models=frozenset({"lumi.sensor_smoke.acn03"}), + ) + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig( + attributes={ + "buzzer_manual_mute": AttrConfig(read_on_startup=False), + "smoke_density": AttrConfig(read_on_startup=False), + "heartbeat_indicator": AttrConfig(read_on_startup=False), + "buzzer_manual_alarm": AttrConfig(read_on_startup=False), + "buzzer": AttrConfig(read_on_startup=False), + "linkage_alarm": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraMagnetAc01Init(_AqaraOppleInitBase): + """Aqara P1 door sensor attribute init.""" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + models=frozenset({"lumi.magnet.ac01"}), + ) + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig( + attributes={ + "detection_distance": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraSwitchAcn047Init(_AqaraOppleInitBase): + """Aqara H1M wall switch attribute init.""" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + models=frozenset({"lumi.switch.acn047"}), + ) + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig( + attributes={ + "switch_mode": AttrConfig(read_on_startup=False), + "switch_type": AttrConfig(read_on_startup=False), + "startup_on_off": AttrConfig(read_on_startup=False), + "decoupled_mode": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraCurtainAgl001Init(_AqaraOppleInitBase): + """Aqara E1 curtain motor attribute init.""" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + models=frozenset({"lumi.curtain.agl001"}), + ) + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig( + attributes={ + "hooks_state": AttrConfig(read_on_startup=False), + "hooks_lock": AttrConfig(read_on_startup=False), + "positions_stored": AttrConfig(read_on_startup=False), + "light_level": AttrConfig(read_on_startup=False), + "hand_open": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(AQARA_OPPLE_CLUSTER) +class AqaraMotionDetectionIntervalSync(_AqaraOppleInitBase): + """Propagate the Aqara motion sensor's `detection_interval` to `ias_zone.reset_s`. + + Runs after attribute init so `detection_interval` is in the cache. + """ + + _unique_id_suffix = "aqara_motion_detection_interval_sync" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({AQARA_OPPLE_CLUSTER}), + models=frozenset({"lumi.motion.ac02", "lumi.motion.agl04"}), + ) + + _server_cluster_config = { + AQARA_OPPLE_CLUSTER: ClusterConfig( + attributes={ + "detection_interval": AttrConfig(read_on_startup=False), + }, + ), + } + + async def async_initialize_cluster(self, cluster: zigpy.zcl.Cluster) -> None: + """Mirror detection_interval into the sibling IAS Zone handler.""" + interval = cluster.get("detection_interval", cluster.get(0x0102)) + if interval is None: + return + ias_zone = getattr(cluster.endpoint, "ias_zone", None) + if ias_zone is None: + return + self.debug("Loaded detection interval at startup: %s", interval) + ias_zone.reset_s = int(interval) + + +# === Other manufacturer-specific clusters === + + +@register_entity(SONOFF_CLUSTER) +class SonoffManufacturerBind(VirtualEntity): + """Bind the Sonoff manufacturer cluster on every device that exposes it.""" + + _unique_id_suffix = "sonoff_manufacturer_bind" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({SONOFF_CLUSTER}), + ) + _server_cluster_config = { + SONOFF_CLUSTER: ClusterConfig(bind=True), + } + + +@register_entity(SONOFF_CLUSTER) +class SonoffPresenceSensorInit(VirtualEntity): + """Sonoff SNZB-06P presence sensor attribute init.""" + + _unique_id_suffix = "sonoff_presence_sensor_init" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({SONOFF_CLUSTER}), + models=frozenset({"SNZB-06P"}), + ) + _server_cluster_config = { + SONOFF_CLUSTER: ClusterConfig( + attributes={ + "last_illumination_state": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(TUYA_MANUFACTURER_CLUSTER) +class TuyaManufacturerBind(VirtualEntity): + """Bind the Tuya manufacturer cluster on every device that exposes it.""" + + _unique_id_suffix = "tuya_manufacturer_bind" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({TUYA_MANUFACTURER_CLUSTER}), + ) + _server_cluster_config = { + TUYA_MANUFACTURER_CLUSTER: ClusterConfig(bind=True), + } + + +@register_entity(TUYA_MANUFACTURER_CLUSTER) +class TuyaPlugManufacturerInit(VirtualEntity): + """Tuya plug manufacturer-cluster attribute init.""" + + _unique_id_suffix = "tuya_plug_manufacturer_init" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({TUYA_MANUFACTURER_CLUSTER}), + exposed_features=frozenset({TUYA_PLUG_MANUFACTURER}), + ) + _server_cluster_config = { + TUYA_MANUFACTURER_CLUSTER: ClusterConfig( + attributes={ + "backlight_mode": AttrConfig(read_on_startup=False), + "power_on_state": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(SINOPE_MANUFACTURER_CLUSTER) +class SinopeManufacturerBind(VirtualEntity): + """Bind the Sinope manufacturer cluster on every device that exposes it.""" + + _unique_id_suffix = "sinope_manufacturer_bind" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({SINOPE_MANUFACTURER_CLUSTER}), + ) + _server_cluster_config = { + SINOPE_MANUFACTURER_CLUSTER: ClusterConfig(bind=True), + } + + +@register_entity(SINOPE_MANUFACTURER_CLUSTER) +class SinopeSwitchInit(VirtualEntity): + """Sinope SW2500/DM2500/DM2550 manufacturer-cluster init + reporting.""" + + _unique_id_suffix = "sinope_switch_init" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({SINOPE_MANUFACTURER_CLUSTER}), + models=frozenset( + { + "SW2500ZB", + "SW2500ZB-G2", + "DM2500ZB", + "DM2500ZB-G2", + "DM2550ZB", + "DM2550ZB-G2", + } + ), + ) + _server_cluster_config = { + SINOPE_MANUFACTURER_CLUSTER: ClusterConfig( + bind=True, + attributes={ + "double_up_full": AttrConfig(read_on_startup=False), + "on_led_color": AttrConfig(read_on_startup=False), + "off_led_color": AttrConfig(read_on_startup=False), + "off_led_intensity": AttrConfig(read_on_startup=False), + "on_led_intensity": AttrConfig(read_on_startup=False), + "action_report": AttrConfig( + read_on_startup=False, + reporting=ReportingConfig( + min_interval=0, max_interval=0, reportable_change=1 + ), + ), + }, + ), + } + + +@register_entity(SINOPE_MANUFACTURER_CLUSTER) +class SinopeDimmerInit(VirtualEntity): + """Extra Sinope dimmer attribute (DM2500/DM2550 only).""" + + _unique_id_suffix = "sinope_dimmer_init" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({SINOPE_MANUFACTURER_CLUSTER}), + models=frozenset({"DM2500ZB", "DM2500ZB-G2", "DM2550ZB", "DM2550ZB-G2"}), + ) + _server_cluster_config = { + SINOPE_MANUFACTURER_CLUSTER: ClusterConfig( + attributes={ + "on_intensity": AttrConfig(read_on_startup=False), + }, + ), + } + + +@register_entity(IKEA_REMOTE_CLUSTER) +class IkeaRemoteClientBind(VirtualEntity): + """Bind the IKEA remote client cluster on every device that exposes it. + + The accompanying quirk (`EventableCluster`) emits its own zha_events for + received commands, so the only thing we still need is the bind. + """ + + _unique_id_suffix = "ikea_remote_client_bind" + + _cluster_match = ClusterMatch( + client_clusters=frozenset({IKEA_REMOTE_CLUSTER}), + match_renamed_clusters=True, + ) + _client_cluster_config = { + IKEA_REMOTE_CLUSTER: ClusterConfig(bind=True), + } + + +@register_entity(IKEA_REMOTE_CLUSTER) +class IkeaRemoteServerBind(VirtualEntity): + """Bind the IKEA remote server cluster on every device that exposes it.""" + + _unique_id_suffix = "ikea_remote_server_bind" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({IKEA_REMOTE_CLUSTER}), + match_renamed_clusters=True, + ) + _server_cluster_config = { + IKEA_REMOTE_CLUSTER: ClusterConfig(bind=True), + } + + +@register_entity(IKEA_SHORTCUT_V1_CLUSTER) +class IkeaSymfoniskRemoteClientBind(VirtualEntity): + """Bind the IKEA Symfonisk shortcut v1 client cluster.""" + + _unique_id_suffix = "ikea_shortcut_v1_client_bind" + + _cluster_match = ClusterMatch( + client_clusters=frozenset({IKEA_SHORTCUT_V1_CLUSTER}), + match_renamed_clusters=True, + ) + _client_cluster_config = { + IKEA_SHORTCUT_V1_CLUSTER: ClusterConfig(bind=True), + } + + +@register_entity(INOVELLI_CLUSTER) +class InovelliBind(VirtualEntity): + """Bind the Inovelli manufacturer cluster on every device that exposes it.""" + + _unique_id_suffix = "inovelli_bind" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), + ) + _server_cluster_config = { + INOVELLI_CLUSTER: ClusterConfig(bind=True), + } + + +@register_entity(INOVELLI_CLUSTER) +class InovelliClientBind(VirtualEntity): + """Bind the Inovelli manufacturer client cluster on every device that exposes it.""" + + _unique_id_suffix = "inovelli_client_bind" + + _cluster_match = ClusterMatch( + client_clusters=frozenset({INOVELLI_CLUSTER}), + ) + _client_cluster_config = { + INOVELLI_CLUSTER: ClusterConfig(bind=True), + } + + +@register_entity(INOVELLI_CLUSTER) +class InovelliVzm30Init(VirtualEntity): + """Inovelli VZM30-SN switch attribute init.""" + + _unique_id_suffix = "inovelli_vzm30_init" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), + models=frozenset({"VZM30-SN"}), + ) + _server_cluster_config = { + INOVELLI_CLUSTER: ClusterConfig( + attributes={ + name: AttrConfig(read_on_startup=fresh) + for name, fresh in { + "dimming_speed_up_remote": False, + "dimming_speed_up_local": False, + "ramp_rate_off_to_on_remote": False, + "ramp_rate_off_to_on_local": False, + "dimming_speed_down_remote": False, + "dimming_speed_down_local": False, + "ramp_rate_on_to_off_remote": False, + "ramp_rate_on_to_off_local": False, + "minimum_level": False, + "maximum_level": False, + "invert_switch": False, + "auto_off_timer": False, + "default_level_local": False, + "default_level_remote": False, + "state_after_power_restored": False, + "load_level_indicator_timeout": False, + "active_power_reports": False, + "periodic_power_and_energy_reports": False, + "active_energy_reports": False, + "power_type": True, + "switch_type": True, + "internal_temp_monitor": False, + "overheated": False, + "button_delay": True, + "smart_bulb_mode": True, + "led_color_when_on": False, + "led_color_when_off": False, + "led_intensity_when_on": False, + "led_intensity_when_off": False, + "led_scaling_mode": False, + "aux_switch_scenes": False, + "binding_off_to_on_sync_level": False, + "local_protection": True, + "output_mode": True, + "firmware_progress_led": False, + "disable_clear_notifications_double_tap": False, + }.items() + }, + ), + } + + +@register_entity(INOVELLI_CLUSTER) +class InovelliVzm31Init(VirtualEntity): + """Inovelli VZM31-SN dimmer attribute init.""" + + _unique_id_suffix = "inovelli_vzm31_init" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), + models=frozenset({"VZM31-SN"}), + ) + _server_cluster_config = { + INOVELLI_CLUSTER: ClusterConfig( + attributes={ + name: AttrConfig(read_on_startup=fresh) + for name, fresh in { + "dimming_speed_up_remote": False, + "dimming_speed_up_local": False, + "ramp_rate_off_to_on_remote": False, + "ramp_rate_off_to_on_local": False, + "dimming_speed_down_remote": False, + "dimming_speed_down_local": False, + "ramp_rate_on_to_off_remote": False, + "ramp_rate_on_to_off_local": False, + "minimum_level": False, + "maximum_level": False, + "invert_switch": False, + "auto_off_timer": False, + "default_level_local": False, + "default_level_remote": False, + "state_after_power_restored": False, + "load_level_indicator_timeout": False, + "active_power_reports": False, + "periodic_power_and_energy_reports": False, + "active_energy_reports": False, + "power_type": True, + "switch_type": True, + "quick_start_time": False, + "quick_start_level": False, + "increased_non_neutral_output": False, + "leading_or_trailing_edge": False, + "internal_temp_monitor": False, + "overheated": False, + "button_delay": True, + "smart_bulb_mode": True, + "double_tap_up_enabled": False, + "double_tap_down_enabled": False, + "double_tap_up_level": False, + "double_tap_down_level": False, + "led_color_when_on": False, + "led_color_when_off": False, + "led_intensity_when_on": False, + "led_intensity_when_off": False, + "led_scaling_mode": False, + "aux_switch_scenes": False, + "binding_off_to_on_sync_level": False, + "local_protection": True, + "output_mode": True, + "on_off_led_mode": False, + "firmware_progress_led": False, + "relay_click_in_on_off_mode": False, + "disable_clear_notifications_double_tap": False, + }.items() + }, + ), + } + + +@register_entity(INOVELLI_CLUSTER) +class InovelliVzm35Init(VirtualEntity): + """Inovelli VZM35-SN fan switch attribute init.""" + + _unique_id_suffix = "inovelli_vzm35_init" + + _cluster_match = ClusterMatch( + server_clusters=frozenset({INOVELLI_CLUSTER}), + models=frozenset({"VZM35-SN"}), + ) + _server_cluster_config = { + INOVELLI_CLUSTER: ClusterConfig( + attributes={ + name: AttrConfig(read_on_startup=fresh) + for name, fresh in { + "dimming_speed_up_remote": False, + "dimming_speed_up_local": False, + "ramp_rate_off_to_on_local": False, + "ramp_rate_off_to_on_remote": False, + "dimming_speed_down_remote": False, + "dimming_speed_down_local": False, + "ramp_rate_on_to_off_local": False, + "ramp_rate_on_to_off_remote": False, + "minimum_level": False, + "maximum_level": False, + "invert_switch": False, + "auto_off_timer": False, + "default_level_local": False, + "default_level_remote": False, + "state_after_power_restored": False, + "load_level_indicator_timeout": False, + "power_type": True, + "switch_type": True, + "non_neutral_aux_med_gear_learn_value": False, + "non_neutral_aux_low_gear_learn_value": False, + "quick_start_time": True, + "button_delay": True, + "smart_fan_mode": True, + "double_tap_up_enabled": False, + "double_tap_down_enabled": False, + "double_tap_up_level": False, + "double_tap_down_level": False, + "led_color_when_on": False, + "led_color_when_off": False, + "led_intensity_when_on": False, + "led_intensity_when_off": False, + "aux_switch_scenes": False, + "local_protection": True, + "output_mode": True, + "on_off_led_mode": False, + "firmware_progress_led": False, + "smart_fan_led_display_levels": False, + }.items() + }, + ), + } diff --git a/zha/decorators.py b/zha/decorators.py index bc5214393..7bc9bcbcb 100644 --- a/zha/decorators.py +++ b/zha/decorators.py @@ -16,12 +16,11 @@ class DictRegistry(dict[int | str, _TypeT]): """Dict Registry of items.""" def register(self, name: int | str) -> Callable[[_TypeT], _TypeT]: - """Return decorator to register item with a specific name.""" + """Return decorator to register an item with a specific name.""" - def decorator(cluster_handler: _TypeT) -> _TypeT: - """Register decorated cluster handler or item.""" - self[name] = cluster_handler - return cluster_handler + def decorator(cls: _TypeT) -> _TypeT: + self[name] = cls + return cls return decorator @@ -32,14 +31,13 @@ class NestedDictRegistry(dict[int | str, dict[int | str | None, _TypeT]]): def register( self, name: int | str, sub_name: int | str | None = None ) -> Callable[[_TypeT], _TypeT]: - """Return decorator to register item with a specific and a quirk name.""" + """Return decorator to register an item under (name, sub_name).""" - def decorator(cluster_handler: _TypeT) -> _TypeT: - """Register decorated cluster handler or item.""" + def decorator(cls: _TypeT) -> _TypeT: if name not in self: self[name] = {} - self[name][sub_name] = cluster_handler - return cluster_handler + self[name][sub_name] = cls + return cls return decorator @@ -48,12 +46,11 @@ class SetRegistry(set[int | str]): """Set Registry of items.""" def register(self, name: int | str) -> Callable[[_TypeT], _TypeT]: - """Return decorator to register item with a specific name.""" + """Return decorator to add a name to the set.""" - def decorator(cluster_handler: _TypeT) -> _TypeT: - """Register decorated cluster handler or item.""" + def decorator(cls: _TypeT) -> _TypeT: self.add(name) - return cluster_handler + return cls return decorator diff --git a/zha/zigbee/cluster_config.py b/zha/zigbee/cluster_config.py new file mode 100644 index 000000000..f0d487d01 --- /dev/null +++ b/zha/zigbee/cluster_config.py @@ -0,0 +1,299 @@ +"""Cluster configuration aggregation for ZHA entities.""" + +from __future__ import annotations + +from dataclasses import dataclass, field +import logging +from typing import TYPE_CHECKING + +import zigpy.exceptions +import zigpy.util +import zigpy.zcl +from zigpy.zcl import ReportingConfig +from zigpy.zcl.foundation import Status, ZCLAttributeDef + +from zha.application.const import ( + ZHA_CLUSTER_BIND_EVENT, + ZHA_CLUSTER_CONFIGURE_REPORTING_EVENT, +) +from zha.application.platforms import AttrConfig, PlatformEntity + +if TYPE_CHECKING: + from collections.abc import Iterable + + from zha.application.platforms import BaseEntity + from zha.zigbee.device import Device + +_LOGGER = logging.getLogger(__name__) + + +@dataclass +class AggregatedAttrConfig: + """Aggregated attribute configuration from multiple entities.""" + + read_on_startup: bool = False + reporting: ReportingConfig | None = None + + def merge(self, config: AttrConfig) -> None: + """Merge another attribute config (fresh read and tightest reporting win).""" + self.read_on_startup = self.read_on_startup or config.read_on_startup + + if config.reporting is not None: + if self.reporting is None: + self.reporting = config.reporting + else: + self.reporting = ReportingConfig( + min_interval=min( + self.reporting.min_interval, config.reporting.min_interval + ), + max_interval=min( + self.reporting.max_interval, config.reporting.max_interval + ), + reportable_change=min( + self.reporting.reportable_change, + config.reporting.reportable_change, + ), + ) + + +@dataclass +class AggregatedClusterConfig: + """Aggregated cluster configuration from multiple entities.""" + + cluster: zigpy.zcl.Cluster + bind: bool = False + attributes: dict[str, AggregatedAttrConfig] = field(default_factory=dict) + entities: list[BaseEntity] = field(default_factory=list) + + +def aggregate_cluster_configs( + entities: Iterable[BaseEntity], +) -> dict[tuple[int, int, bool], AggregatedClusterConfig]: + """Aggregate cluster configurations from entities. + + Returns a dict keyed by (endpoint_id, cluster_id) with merged configs. + """ + result: dict[tuple[int, int, bool], AggregatedClusterConfig] = {} + + for entity in entities: + if not isinstance(entity, PlatformEntity): + continue + + if not entity._server_cluster_config and not entity._client_cluster_config: + continue + + for cluster_id, config in entity._server_cluster_config.items(): + cluster = entity.endpoint.zigpy_endpoint.in_clusters.get(cluster_id) + if cluster is None: + continue + + key = (entity.endpoint.id, cluster_id, True) + if key not in result: + result[key] = AggregatedClusterConfig(cluster=cluster) + + agg = result[key] + agg.bind = agg.bind or config.bind + agg.entities.append(entity) + + for attr_def, attr_config in config.attributes.items(): + attr_name = ( + attr_def.name if isinstance(attr_def, ZCLAttributeDef) else attr_def + ) + if attr_name not in agg.attributes: + agg.attributes[attr_name] = AggregatedAttrConfig() + agg.attributes[attr_name].merge(attr_config) + + for cluster_id, config in entity._client_cluster_config.items(): + cluster = entity.endpoint.zigpy_endpoint.out_clusters.get(cluster_id) + if cluster is None: + continue + + key = (entity.endpoint.id, cluster_id, False) + if key not in result: + result[key] = AggregatedClusterConfig(cluster=cluster) + + agg = result[key] + agg.bind = agg.bind or config.bind + agg.entities.append(entity) + + for attr_def, attr_config in config.attributes.items(): + attr_name = ( + attr_def.name if isinstance(attr_def, ZCLAttributeDef) else attr_def + ) + if attr_name not in agg.attributes: + agg.attributes[attr_name] = AggregatedAttrConfig() + agg.attributes[attr_name].merge(attr_config) + + return result + + +async def configure_cluster_configs( + device: Device, + configs: dict[tuple[int, int, bool], AggregatedClusterConfig], +) -> None: + """Execute binding, reporting, and post-bind hooks from aggregated configs. + + Emits `ClusterBindEvent` and `ClusterConfigureReportingEvent` on `device` + so listeners (HA Core diagnostics, reconfigure dialog) can observe the + per-cluster outcomes. + """ + # Imported lazily to avoid a circular import. + from zha.zigbee.device import ( # noqa: PLC0415 + ClusterBindEvent, + ClusterConfigureReportingEvent, + ) + + for (endpoint_id, _cluster_id, _is_server), agg in configs.items(): + if agg.bind: + try: + res = await agg.cluster.bind() + success = res[0] == 0 + _LOGGER.debug( + "[%s] Bound cluster %s: %s", + agg.cluster.endpoint.device.ieee, + agg.cluster.ep_attribute, + res[0], + ) + except (zigpy.exceptions.ZigbeeException, TimeoutError) as ex: + _LOGGER.debug( + "[%s] Failed to bind cluster %s: %s", + agg.cluster.endpoint.device.ieee, + agg.cluster.ep_attribute, + ex, + ) + success = False + + device.emit( + ZHA_CLUSTER_BIND_EVENT, + ClusterBindEvent( + device_ieee=device.ieee, + endpoint_id=endpoint_id, + cluster_id=agg.cluster.cluster_id, + cluster_name=agg.cluster.name, + success=success, + ), + ) + + reporting_attrs = {} + for attr_name, attr_config in agg.attributes.items(): + if attr_config.reporting is None: + continue + attr_def = agg.cluster.find_attribute(attr_name) + reporting_attrs[attr_def] = attr_config.reporting + + if reporting_attrs: + event_data = { + attr_def.name: { + "min": cfg.min_interval, + "max": cfg.max_interval, + "id": attr_def.id, + "name": attr_def.name, + "change": cfg.reportable_change, + "status": None, + } + for attr_def, cfg in reporting_attrs.items() + } + + try: + res = await agg.cluster.configure_reporting_multiple(reporting_attrs) + _LOGGER.debug( + "[%s] Configured reporting for %s on cluster %s: %s", + agg.cluster.endpoint.device.ieee, + list(reporting_attrs.keys()), + agg.cluster.ep_attribute, + res, + ) + if not res: + for attr_def in reporting_attrs: + event_data[attr_def.name]["status"] = Status.FAILURE.name + else: + for attr_def, status in res.items(): + event_data[attr_def.name]["status"] = status.name + except Exception as ex: + _LOGGER.debug( + "[%s] Failed to configure reporting on cluster %s: %s", + agg.cluster.endpoint.device.ieee, + agg.cluster.ep_attribute, + ex, + ) + for attr_def in reporting_attrs: + event_data[attr_def.name]["status"] = Status.FAILURE.name + + device.emit( + ZHA_CLUSTER_CONFIGURE_REPORTING_EVENT, + ClusterConfigureReportingEvent( + device_ieee=device.ieee, + endpoint_id=endpoint_id, + cluster_id=agg.cluster.cluster_id, + cluster_name=agg.cluster.name, + attributes=event_data, + ), + ) + + for entity in agg.entities: + try: + await entity.async_configure_cluster(agg.cluster) + except Exception: # pylint: disable=broad-except + _LOGGER.debug( + "[%s] async_configure_cluster on %s raised", + agg.cluster.endpoint.device.ieee, + type(entity).__name__, + exc_info=True, + ) + + +async def initialize_cluster_configs( + configs: dict[tuple[int, int, bool], AggregatedClusterConfig], + from_cache: bool, +) -> None: + """Read initial attribute values from aggregated configs.""" + for agg in configs.values(): + cached_attrs = [ + attr_name + for attr_name, attr_config in agg.attributes.items() + if not attr_config.read_on_startup + ] + fresh_attrs = [ + attr_name + for attr_name, attr_config in agg.attributes.items() + if attr_config.read_on_startup + ] + + if cached_attrs: + try: + await agg.cluster.read_attributes( + cached_attrs, allow_cache=True, only_cache=from_cache + ) + except Exception as ex: # pylint: disable=broad-except + _LOGGER.debug( + "[%s] Failed to read attributes %s from cluster %s: %s", + agg.cluster.endpoint.device.ieee, + cached_attrs, + agg.cluster.ep_attribute, + ex, + ) + + if fresh_attrs: + try: + await agg.cluster.read_attributes( + fresh_attrs, allow_cache=from_cache, only_cache=from_cache + ) + except Exception as ex: # pylint: disable=broad-except + _LOGGER.debug( + "[%s] Failed to read attributes %s from cluster %s: %s", + agg.cluster.endpoint.device.ieee, + fresh_attrs, + agg.cluster.ep_attribute, + ex, + ) + + for entity in agg.entities: + try: + await entity.async_initialize_cluster(agg.cluster) + except Exception: # pylint: disable=broad-except + _LOGGER.debug( + "[%s] async_initialize_cluster on %s raised", + agg.cluster.endpoint.device.ieee, + type(entity).__name__, + exc_info=True, + ) diff --git a/zha/zigbee/cluster_handlers/__init__.py b/zha/zigbee/cluster_handlers/__init__.py deleted file mode 100644 index d7a8d0e92..000000000 --- a/zha/zigbee/cluster_handlers/__init__.py +++ /dev/null @@ -1,754 +0,0 @@ -"""Cluster handlers module for Zigbee Home Automation.""" - -from __future__ import annotations - -from collections.abc import Awaitable, Callable, Coroutine, Iterator -import contextlib -from dataclasses import dataclass -from enum import Enum -import functools -import logging -from typing import TYPE_CHECKING, Any, Final, ParamSpec, TypedDict - -import zigpy.exceptions -from zigpy.typing import UNDEFINED, UndefinedType -import zigpy.util -import zigpy.zcl -from zigpy.zcl import ( - AttributeReadEvent, - AttributeReportedEvent, - AttributeUpdatedEvent, - AttributeWrittenEvent, -) -from zigpy.zcl.foundation import CommandSchema, Status, ZCLAttributeDef -from zigpy.zcl.helpers import ReportingConfig - -from zha.application.const import ( - ZHA_CLUSTER_HANDLER_MSG, - ZHA_CLUSTER_HANDLER_MSG_BIND, - ZHA_CLUSTER_HANDLER_MSG_CFG_RPT, -) -from zha.application.helpers import safe_read -from zha.event import EventBase -from zha.exceptions import ZHAException -from zha.mixins import LogMixin -from zha.zigbee.cluster_handlers.const import ( - ARGS, - ATTRIBUTE_ID, - ATTRIBUTE_NAME, - ATTRIBUTE_VALUE, - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - CLUSTER_HANDLER_EVENT, - CLUSTER_HANDLER_ZDO, - CLUSTER_ID, - CLUSTER_READS_PER_REQ, - COMMAND, - PARAMS, - REPORT_CONFIG_ATTR_PER_REQ, - SIGNAL_ATTR_UPDATED, - UNIQUE_ID, - VALUE, -) - -if TYPE_CHECKING: - from zha.zigbee.endpoint import Endpoint - -_LOGGER = logging.getLogger(__name__) -RETRYABLE_REQUEST_DECORATOR = zigpy.util.retryable_request(tries=3) -UNPROXIED_CLUSTER_METHODS = {"general_command"} - - -_P = ParamSpec("_P") -_FuncType = Callable[_P, Awaitable[Any]] -_ReturnFuncType = Callable[_P, Coroutine[Any, Any, Any]] - - -@contextlib.contextmanager -def wrap_zigpy_exceptions() -> Iterator[None]: - """Wrap zigpy exceptions in `ZHAException` exceptions.""" - try: - yield - except TimeoutError as exc: - raise ZHAException("Failed to send request: device did not respond") from exc - except zigpy.exceptions.ZigbeeException as exc: - message = "Failed to send request" - - if str(exc): - message = f"{message}: {exc}" - - raise ZHAException(message) from exc - - -def retry_request[**P]( - func: Callable[P, Awaitable[Any]], -) -> Callable[P, Coroutine[Any, Any, Any]]: - """Send a request with retries and wrap expected zigpy exceptions.""" - - @functools.wraps(func) - async def wrapper(*args: P.args, **kwargs: P.kwargs) -> Any: - with wrap_zigpy_exceptions(): - return await RETRYABLE_REQUEST_DECORATOR(func)(*args, **kwargs) - - return wrapper - - -class AttrReportConfig(TypedDict, total=True): - """Configuration to report for the attributes.""" - - # An attribute name - attr: str - # The config for the attribute reporting configuration consists of a tuple for - # (minimum_reported_time_interval_s, maximum_reported_time_interval_s, value_delta) - config: tuple[int, int, int | float] - - -def parse_and_log_command(cluster_handler, tsn, command_id, args): - """Parse and log a zigbee cluster command.""" - try: - name = cluster_handler.cluster.server_commands[command_id].name - except KeyError: - name = f"0x{command_id:02X}" - - cluster_handler.debug( - "received '%s' command with %s args on cluster_id '%s' tsn '%s'", - name, - args, - cluster_handler.cluster.cluster_id, - tsn, - ) - return name - - -class ClusterHandlerStatus(Enum): - """Status of a cluster handler.""" - - CREATED = 1 - CONFIGURED = 2 - INITIALIZED = 3 - - -@dataclass(kw_only=True, frozen=True) -class ClusterAttributeUpdatedEvent: - """Event to signal that a cluster attribute has been updated.""" - - attribute_id: int - 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 - - -@dataclass(kw_only=True, frozen=True) -class ClusterBindEvent: - """Event generated when the cluster is bound.""" - - cluster_name: str - cluster_id: int - success: bool - cluster_handler_unique_id: str - event_type: Final[str] = ZHA_CLUSTER_HANDLER_MSG - event: Final[str] = ZHA_CLUSTER_HANDLER_MSG_BIND - - -@dataclass(kw_only=True, frozen=True) -class ClusterConfigureReportingEvent: - """Event generates when a cluster configures attribute reporting.""" - - cluster_name: str - cluster_id: int - attributes: dict[str, dict[str, Any]] - cluster_handler_unique_id: str - event_type: Final[str] = ZHA_CLUSTER_HANDLER_MSG - event: Final[str] = ZHA_CLUSTER_HANDLER_MSG_CFG_RPT - - -@dataclass(kw_only=True, frozen=True) -class ClusterInfo: - """Cluster information.""" - - id: int - name: str - type: str - commands: dict[int, str] - - -@dataclass(kw_only=True, frozen=True) -class ClusterHandlerInfo: - """Cluster handler information.""" - - class_name: str - generic_id: str - endpoint_id: str - cluster: ClusterInfo - id: str - unique_id: str - status: ClusterHandlerStatus - value_attribute: str | None = None - - -class ClusterHandler(LogMixin, EventBase): - """Base cluster handler for a Zigbee cluster.""" - - REPORT_CONFIG: tuple[AttrReportConfig, ...] = () - BIND: bool = True - - # Dict of attributes to read on cluster handler initialization. - # Dict keys -- attribute ID or names, with bool value indicating whether a cached - # attribute read is acceptable. - ZCL_INIT_ATTRS: dict[str, bool] = {} - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize ClusterHandler.""" - super().__init__() - self._generic_id = f"cluster_handler_0x{cluster.cluster_id:04x}" - self._endpoint: Endpoint = endpoint - self._cluster: zigpy.zcl.Cluster = cluster - self._id: str = f"{endpoint.id}:0x{cluster.cluster_id:04x}" - unique_id: str = endpoint.unique_id.replace("-", ":") - self._unique_id: str = f"{unique_id}:0x{cluster.cluster_id:04x}" - if not hasattr(self, "_value_attribute") and self.REPORT_CONFIG: - attr_def: ZCLAttributeDef = self.cluster.attributes_by_name[ - self.REPORT_CONFIG[0]["attr"] - ] - self.value_attribute = attr_def.name - self._status: ClusterHandlerStatus = ClusterHandlerStatus.CREATED - self.data_cache: dict[str, Any] = {} - self._unsubs: list[Callable[[], None]] = [] - - def on_add(self) -> None: - """Call when cluster handler is added.""" - self._cluster.add_listener(self) - for event_type in ( - AttributeReadEvent, - AttributeReportedEvent, - AttributeUpdatedEvent, - AttributeWrittenEvent, - ): - self._unsubs.append( - self._cluster.on_event( - event_type.event_type, self._handle_attribute_updated_event - ) - ) - - def on_remove(self) -> None: - """Call when cluster handler will be removed.""" - self._cluster.remove_listener(self) - for unsub in self._unsubs: - unsub() - self._unsubs.clear() - - def _handle_attribute_updated_event( - self, - event: AttributeReadEvent - | AttributeReportedEvent - | AttributeUpdatedEvent - | AttributeWrittenEvent, - ) -> None: - """Handle attribute updated event from zigpy.""" - self.debug( - "cluster_handler[%s] attribute_updated - cluster[%s] attr[%s] value[%s]", - self.name, - self.cluster.name, - event.attribute_name, - event.value, - ) - self.emit( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - ClusterAttributeUpdatedEvent( - attribute_id=event.attribute_id, - attribute_name=event.attribute_name, - attribute_value=event.value, - cluster_handler_unique_id=self.unique_id, - cluster_id=self.cluster.cluster_id, - ), - ) - - @classmethod - def matches(cls, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> bool: # pylint: disable=unused-argument - """Filter the cluster match for specific devices.""" - return True - - @functools.cached_property - def info_object(self) -> ClusterHandlerInfo: - """Return info about this cluster handler.""" - return ClusterHandlerInfo( - class_name=self.__class__.__name__, - generic_id=self._generic_id, - endpoint_id=self._endpoint.id, - cluster=ClusterInfo( - id=self._cluster.cluster_id, - name=self._cluster.name, - type="client" if self._cluster.is_client else "server", - commands=self._cluster.commands, - ), - id=self._id, - unique_id=self._unique_id, - status=self._status.name, - value_attribute=getattr(self, "value_attribute", None), - ) - - @functools.cached_property - def id(self) -> str: - """Return cluster handler id unique for this device only.""" - return self._id - - @functools.cached_property - def generic_id(self) -> str: - """Return the generic id for this cluster handler.""" - return self._generic_id - - @functools.cached_property - def unique_id(self) -> str: - """Return the unique id for this cluster handler.""" - return self._unique_id - - @functools.cached_property - def cluster(self) -> zigpy.zcl.Cluster: - """Return the zigpy cluster for this cluster handler.""" - return self._cluster - - @functools.cached_property - def name(self) -> str: - """Return friendly name.""" - return self.cluster.ep_attribute or self._generic_id - - @property - def status(self) -> ClusterHandlerStatus: - """Return the status of the cluster handler.""" - return self._status - - def __hash__(self) -> int: - """Make this a hashable.""" - return hash(self._unique_id) - - async def bind(self) -> None: - """Bind a zigbee cluster. - - This also swallows ZigbeeException exceptions that are thrown when - devices are unreachable. - """ - try: - res = await RETRYABLE_REQUEST_DECORATOR(self.cluster.bind)() - self.debug("bound '%s' cluster: %s", self.cluster.ep_attribute, res[0]) - self._endpoint.device.emit( - ZHA_CLUSTER_HANDLER_MSG_BIND, - ClusterBindEvent( - cluster_name=self.cluster.name, - cluster_id=self.cluster.cluster_id, - cluster_handler_unique_id=self.unique_id, - success=res[0] == 0, - ), - ) - except (zigpy.exceptions.ZigbeeException, TimeoutError) as ex: - self.debug( - "Failed to bind '%s' cluster: %s", - self.cluster.ep_attribute, - str(ex), - exc_info=ex, - ) - self._endpoint.device.emit( - ZHA_CLUSTER_HANDLER_MSG_BIND, - ClusterBindEvent( - cluster_name=self.cluster.name, - cluster_id=self.cluster.cluster_id, - cluster_handler_unique_id=self.unique_id, - success=False, - ), - ) - - async def configure_reporting(self) -> None: - """Configure attribute reporting for a cluster. - - This also swallows ZigbeeException exceptions that are thrown when - devices are unreachable. - """ - event_data = {} - - for attr_report in self.REPORT_CONFIG: - attr, config = attr_report["attr"], attr_report["config"] - - try: - attr_name = self.cluster.find_attribute(attr).name - except KeyError: - attr_name = attr - - event_data[attr_name] = { - "min": config[0], - "max": config[1], - "id": attr, - "name": attr_name, - "change": config[2], - "status": None, - } - - to_configure = [*self.REPORT_CONFIG] - chunk, rest = ( - to_configure[:REPORT_CONFIG_ATTR_PER_REQ], - to_configure[REPORT_CONFIG_ATTR_PER_REQ:], - ) - while chunk: - reports = { - self.cluster.find_attribute(rec["attr"]): ReportingConfig( - *rec["config"] - ) - for rec in chunk - } - try: - res = await RETRYABLE_REQUEST_DECORATOR( - self.cluster.configure_reporting_multiple - )(reports) - self._configure_reporting_status(res, event_data, set(reports.keys())) - except (zigpy.exceptions.ZigbeeException, TimeoutError) as ex: - self.debug( - "failed to set reporting on '%s' cluster for: %s", - self.cluster.ep_attribute, - str(ex), - ) - break - chunk, rest = ( - rest[:REPORT_CONFIG_ATTR_PER_REQ], - rest[REPORT_CONFIG_ATTR_PER_REQ:], - ) - - self._endpoint.device.emit( - ZHA_CLUSTER_HANDLER_MSG_CFG_RPT, - ClusterConfigureReportingEvent( - cluster_name=self.cluster.name, - cluster_id=self.cluster.cluster_id, - cluster_handler_unique_id=self.unique_id, - attributes=event_data, - ), - ) - - def _configure_reporting_status( - self, - res: dict[ZCLAttributeDef, Status], - event_data: dict[str, dict[str, Any]], - requested_attrs: set[ZCLAttributeDef], - ) -> None: - """Parse configure reporting result.""" - if not res: - for attr_def in requested_attrs: - event_data[attr_def.name]["status"] = Status.FAILURE.name - return - - for attr_def, status in res.items(): - event_data[attr_def.name]["status"] = status.name - - failed = [ - attr_def.name - for attr_def, status in res.items() - if status != Status.SUCCESS - ] - if failed: - self.debug( - "Failed to configure reporting for '%s' on '%s' cluster: %s", - failed, - self.name, - res, - ) - success = [ - attr_def.name - for attr_def, status in res.items() - if status == Status.SUCCESS - ] - if success: - self.debug( - "Successfully configured reporting for '%s' on '%s' cluster", - success, - self.name, - ) - - async def async_configure(self) -> None: - """Set cluster binding and attribute reporting.""" - if self._endpoint.device.skip_configuration: - self.debug("skipping cluster handler configuration") - self._status = ClusterHandlerStatus.CONFIGURED - return - - if self.BIND: - self.debug("Performing cluster binding") - await self.bind() - - if self.cluster.is_server: - self.debug("Configuring cluster attribute reporting") - await self.configure_reporting() - - self.debug("finished cluster handler configuration") - self._status = ClusterHandlerStatus.CONFIGURED - - async def async_initialize(self, from_cache: bool) -> None: - """Initialize cluster handler.""" - if not from_cache and self._endpoint.device.skip_configuration: - self.debug("Skipping cluster handler initialization") - self._status = ClusterHandlerStatus.INITIALIZED - return - - self.debug("initializing cluster handler: from_cache: %s", from_cache) - cached = [a for a, cached in self.ZCL_INIT_ATTRS.items() if cached] - uncached = [a for a, cached in self.ZCL_INIT_ATTRS.items() if not cached] - uncached.extend([cfg["attr"] for cfg in self.REPORT_CONFIG]) - - if cached: - self.debug("initializing cached cluster handler attributes: %s", cached) - await self._get_attributes( - True, cached, from_cache=True, only_cache=from_cache - ) - if uncached: - self.debug( - "initializing uncached cluster handler attributes: %s - from cache[%s]", - uncached, - from_cache, - ) - await self._get_attributes( - True, uncached, from_cache=from_cache, only_cache=from_cache - ) - - ch_specific_init = getattr( - self, "async_initialize_cluster_handler_specific", None - ) - if ch_specific_init: - self.debug( - "Performing cluster handler specific initialization: %s", uncached - ) - await ch_specific_init(from_cache=from_cache) - - self.debug("finished cluster handler initialization") - self._status = ClusterHandlerStatus.INITIALIZED - - def cluster_command(self, tsn, command_id, args) -> None: - """Handle commands received to this cluster.""" - - def zdo_command(self, *args, **kwargs) -> None: - """Handle ZDO commands on this cluster.""" - - def zha_send_event(self, command: str, arg: list | dict | CommandSchema) -> None: - """Compatibility method for emitting ZHA events from quirks until they are updated.""" - self.emit_zha_event(command, arg) - - def emit_zha_event(self, command: str, arg: list | dict | CommandSchema) -> None: - """Relay events to listeners.""" - - args: list | dict - if isinstance(arg, CommandSchema): - args = [a for a in arg if a is not None] - params = arg.as_dict() - elif isinstance(arg, (list, dict)): - # Quirks can directly send lists and dicts to ZHA this way - args = arg - params = {} - else: - raise TypeError(f"Unexpected emit_zha_event {command!r} argument: {arg!r}") - - self._endpoint.emit_zha_event( - { - UNIQUE_ID: self.unique_id, - CLUSTER_ID: self.cluster.cluster_id, - COMMAND: command, - # Maintain backwards compatibility with the old zigpy response format - ARGS: args, - PARAMS: params, - } - ) - - async def async_update(self) -> None: - """Retrieve latest state from cluster.""" - - def _get_attribute_name(self, attrid: int) -> str | int: - if attrid not in self.cluster.attributes: - return attrid - - return self.cluster.attributes[attrid].name - - async def get_attribute_value(self, attribute, from_cache=True) -> Any: - """Get the value for an attribute.""" - result = await safe_read( - self._cluster, - [attribute], - allow_cache=from_cache, - only_cache=from_cache, - ) - return result.get(attribute) - - async def _get_attributes( - self, - raise_exceptions: bool, - attributes: list[str], - from_cache: bool = True, - only_cache: bool = True, - ) -> dict[int | str, Any]: - """Get the values for a list of attributes.""" - chunk = attributes[:CLUSTER_READS_PER_REQ] - rest = attributes[CLUSTER_READS_PER_REQ:] - result = {} - while chunk: - try: - self.debug("Reading attributes in chunks: %s", chunk) - read, _ = await RETRYABLE_REQUEST_DECORATOR( - self.cluster.read_attributes - )( - chunk, - allow_cache=from_cache, - only_cache=only_cache, - manufacturer=UNDEFINED, # some quirks override default with None - ) - self.debug("Got attributes: %s", read) - result.update(read) - except (TimeoutError, zigpy.exceptions.ZigbeeException) as ex: - self.debug( - "failed to get attributes '%s' on '%s' cluster: %s", - chunk, - self.cluster.ep_attribute, - str(ex), - ) - if raise_exceptions: - raise - chunk = rest[:CLUSTER_READS_PER_REQ] - rest = rest[CLUSTER_READS_PER_REQ:] - return result - - async def get_attributes( - self, - attributes: list[str], - from_cache: bool = True, - only_cache: bool = True, - ) -> dict[int | str, Any]: - """Get the values for a list of attributes and raise no exceptions.""" - return await self._get_attributes(False, attributes, from_cache, only_cache) - - async def write_attributes_safe( - self, - attributes: dict[str, Any], - manufacturer: int | UndefinedType | None = UNDEFINED, - ) -> None: - """Wrap `write_attributes` to throw an exception on attribute write failure.""" - - res = await self.write_attributes(attributes, manufacturer=manufacturer) - for record in res[0]: - if record.status != Status.SUCCESS: - try: - name = self.cluster.attributes[record.attrid].name - value = attributes.get(name, "unknown") - except KeyError: - name = f"0x{record.attrid:04x}" - value = "unknown" - - raise ZHAException( - f"Failed to write attribute {name}={value}: {record.status}", - ) - - def log(self, level, msg, *args, **kwargs) -> None: - """Log a message.""" - msg = f"[%s:%s]: {msg}" - args = (self._endpoint.device.nwk, self._id) + args - _LOGGER.log(level, msg, *args, stacklevel=3, **kwargs) - - def __getattr__(self, name): - """Get attribute or a decorated cluster command.""" - if ( - hasattr(self._cluster, name) - and callable(getattr(self._cluster, name)) - and name not in UNPROXIED_CLUSTER_METHODS - ): - command = getattr(self._cluster, name) - wrapped_command = retry_request(command) - wrapped_command.__name__ = name - - return wrapped_command - return self.__getattribute__(name) - - -class ZDOClusterHandler(LogMixin): - """Cluster handler for ZDO events.""" - - def __init__(self, device) -> None: - """Initialize ZDOClusterHandler.""" - self.name = CLUSTER_HANDLER_ZDO - self._cluster = device.device.endpoints[0] - self._zha_device = device - self._status = ClusterHandlerStatus.CREATED - self._unique_id = f"{str(device.ieee)}:{device.name}_ZDO" - - def on_add(self) -> None: - """Call when cluster handler is added.""" - self._cluster.add_listener(self) - - def on_remove(self) -> None: - """Call when cluster handler will be removed.""" - self._cluster.remove_listener(self) - - @property - def unique_id(self): - """Return the unique id for this cluster handler.""" - return self._unique_id - - @property - def cluster(self): - """Return the aigpy cluster for this cluster handler.""" - return self._cluster - - @property - def status(self): - """Return the status of the cluster handler.""" - return self._status - - def device_announce(self, zigpy_device): - """Device announce handler.""" - - def permit_duration(self, duration): - """Permit handler.""" - - async def async_initialize(self, from_cache): # pylint: disable=unused-argument - """Initialize cluster handler.""" - self._status = ClusterHandlerStatus.INITIALIZED - - async def async_configure(self): - """Configure cluster handler.""" - self._status = ClusterHandlerStatus.CONFIGURED - - def log(self, level, msg, *args, **kwargs): - """Log a message.""" - msg = f"[%s:ZDO](%s): {msg}" - args = (self._zha_device.nwk, self._zha_device.model) + args - _LOGGER.log(level, msg, *args, **kwargs) - - -class ClientClusterHandler(ClusterHandler): - """ClusterHandler for Zigbee client (output) clusters.""" - - def __init__(self, *args, **kwargs) -> None: - """Initialize ClientClusterHandler.""" - super().__init__(*args, **kwargs) - self._unique_id += "_CLIENT" - self._generic_id += "_client" - self._id += "_client" - - def _handle_attribute_updated_event( - self, - event: AttributeReadEvent - | AttributeReportedEvent - | AttributeUpdatedEvent - | AttributeWrittenEvent, - ) -> None: - """Handle an attribute updated on this cluster.""" - super()._handle_attribute_updated_event(event) - - self.emit_zha_event( - SIGNAL_ATTR_UPDATED, - { - ATTRIBUTE_ID: event.attribute_id, - ATTRIBUTE_NAME: event.attribute_name or "Unknown", - ATTRIBUTE_VALUE: event.value, - VALUE: event.value, - }, - ) - - def cluster_command(self, tsn, command_id, args): - """Handle a cluster command received on this cluster.""" - if ( - self._cluster.server_commands is not None - and self._cluster.server_commands.get(command_id) is not None - ): - self.emit_zha_event(self._cluster.server_commands[command_id].name, args) diff --git a/zha/zigbee/cluster_handlers/closures.py b/zha/zigbee/cluster_handlers/closures.py deleted file mode 100644 index c0e9a28b7..000000000 --- a/zha/zigbee/cluster_handlers/closures.py +++ /dev/null @@ -1,230 +0,0 @@ -"""Closures cluster handlers module for Zigbee Home Automation.""" - -from __future__ import annotations - -import zigpy.types as t -from zigpy.zcl.clusters.closures import ConfigStatus, DoorLock, Shade, WindowCovering - -from zha.zigbee.cluster_handlers import ( - AttrReportConfig, - ClientClusterHandler, - ClusterAttributeUpdatedEvent, - ClusterHandler, - registries, -) -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - REPORT_CONFIG_IMMEDIATE, -) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(DoorLock.cluster_id) -class DoorLockClusterHandler(ClusterHandler): - """Door lock cluster handler.""" - - _value_attribute: str = DoorLock.AttributeDefs.lock_state.name - REPORT_CONFIG = ( - AttrReportConfig( - attr=DoorLock.AttributeDefs.lock_state.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - ) - - async def async_update(self): - """Retrieve latest state.""" - result = await self.get_attribute_value( - DoorLock.AttributeDefs.lock_state.name, from_cache=True - ) - if result is not None: - self.emit( - CLUSTER_HANDLER_ATTRIBUTE_UPDATED, - ClusterAttributeUpdatedEvent( - attribute_id=DoorLock.AttributeDefs.lock_state.id, - attribute_name=DoorLock.AttributeDefs.lock_state.name, - attribute_value=result, - cluster_handler_unique_id=self.unique_id, - cluster_id=self.cluster.cluster_id, - ), - ) - - def cluster_command(self, tsn, command_id, args): - """Handle a cluster command received on this cluster.""" - - if ( - self._cluster.client_commands is None - or self._cluster.client_commands.get(command_id) is None - ): - return - - command_name = self._cluster.client_commands[command_id].name - - if command_name == DoorLock.ClientCommandDefs.operation_event_notification.name: - self.emit_zha_event( - command_name, - { - "source": args[0].name, - "operation": args[1].name, - "code_slot": (args[2] + 1), # start code slots at 1 - }, - ) - - async def async_set_user_code(self, code_slot: int, user_code: str) -> None: - """Set the user code for the code slot.""" - - await self.set_pin_code( - code_slot - 1, # start code slots at 1, Zigbee internals use 0 - DoorLock.UserStatus.Enabled, - DoorLock.UserType.Unrestricted, - user_code, - ) - - async def async_enable_user_code(self, code_slot: int) -> None: - """Enable the code slot.""" - - await self.set_user_status(code_slot - 1, DoorLock.UserStatus.Enabled) - - async def async_disable_user_code(self, code_slot: int) -> None: - """Disable the code slot.""" - - await self.set_user_status(code_slot - 1, DoorLock.UserStatus.Disabled) - - async def async_get_user_code(self, code_slot: int) -> int: - """Get the user code from the code slot.""" - - result = await self.get_pin_code(code_slot - 1) - return result - - async def async_clear_user_code(self, code_slot: int) -> None: - """Clear the code slot.""" - - await self.clear_pin_code(code_slot - 1) - - async def async_clear_all_user_codes(self) -> None: - """Clear all code slots.""" - - await self.clear_all_pin_codes() - - async def async_set_user_type(self, code_slot: int, user_type: str) -> None: - """Set user type.""" - - await self.set_user_type(code_slot - 1, user_type) - - async def async_get_user_type(self, code_slot: int) -> str: - """Get user type.""" - - result = await self.get_user_type(code_slot - 1) - return result - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Shade.cluster_id) -class ShadeClusterHandler(ClusterHandler): - """Shade cluster handler.""" - - -@registries.CLIENT_CLUSTER_HANDLER_REGISTRY.register(WindowCovering.cluster_id) -class WindowCoveringClientClusterHandler(ClientClusterHandler): - """Window client cluster handler.""" - - -@registries.BINDABLE_CLUSTERS.register(WindowCovering.cluster_id) -@registries.CLUSTER_HANDLER_REGISTRY.register(WindowCovering.cluster_id) -class WindowCoveringClusterHandler(ClusterHandler): - """Window cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=WindowCovering.AttributeDefs.current_position_lift_percentage.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=WindowCovering.AttributeDefs.current_position_tilt_percentage.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - ) - - ZCL_INIT_ATTRS = { - WindowCovering.AttributeDefs.window_covering_type.name: True, - WindowCovering.AttributeDefs.window_covering_mode.name: True, - WindowCovering.AttributeDefs.config_status.name: True, - WindowCovering.AttributeDefs.installed_closed_limit_lift.name: True, - WindowCovering.AttributeDefs.installed_closed_limit_tilt.name: True, - WindowCovering.AttributeDefs.installed_open_limit_lift.name: True, - WindowCovering.AttributeDefs.installed_open_limit_tilt.name: True, - } - - async def async_update(self): - """Retrieve latest state.""" - await self.get_attributes( - [ - WindowCovering.AttributeDefs.current_position_lift_percentage.name, - WindowCovering.AttributeDefs.current_position_tilt_percentage.name, - ], - from_cache=False, - only_cache=False, - ) - - @property - def inverted(self): - """Return true if the window covering is inverted.""" - config_status = self.cluster.get( - WindowCovering.AttributeDefs.config_status.name - ) - return ( - config_status is not None - and ConfigStatus.Open_up_commands_reversed in ConfigStatus(config_status) - ) - - @property - def current_position_lift_percentage(self) -> t.uint16_t | None: - """Return the current lift percentage of the window covering.""" - lift_percentage = self.cluster.get( - WindowCovering.AttributeDefs.current_position_lift_percentage.name - ) - if lift_percentage is not None: - # the 100 - value is because we need to invert the value before giving it to the entity - lift_percentage = 100 - lift_percentage - return lift_percentage - - @property - def current_position_tilt_percentage(self) -> t.uint16_t | None: - """Return the current tilt percentage of the window covering.""" - tilt_percentage = self.cluster.get( - WindowCovering.AttributeDefs.current_position_tilt_percentage.name - ) - if tilt_percentage is not None: - # the 100 - value is because we need to invert the value before giving it to the entity - tilt_percentage = 100 - tilt_percentage - return tilt_percentage - - @property - def installed_open_limit_lift(self) -> t.uint16_t | None: - """Return the installed open lift limit of the window covering.""" - return self.cluster.get( - WindowCovering.AttributeDefs.installed_open_limit_lift.name - ) - - @property - def installed_closed_limit_lift(self) -> t.uint16_t | None: - """Return the installed closed lift limit of the window covering.""" - return self.cluster.get( - WindowCovering.AttributeDefs.installed_closed_limit_lift.name - ) - - @property - def installed_open_limit_tilt(self) -> t.uint16_t | None: - """Return the installed open tilt limit of the window covering.""" - return self.cluster.get( - WindowCovering.AttributeDefs.installed_open_limit_tilt.name - ) - - @property - def installed_closed_limit_tilt(self) -> t.uint16_t | None: - """Return the installed closed tilt limit of the window covering.""" - return self.cluster.get( - WindowCovering.AttributeDefs.installed_closed_limit_tilt.name - ) - - @property - def window_covering_type(self) -> WindowCovering.WindowCoveringType | None: - """Return the window covering type.""" - return self.cluster.get(WindowCovering.AttributeDefs.window_covering_type.name) diff --git a/zha/zigbee/cluster_handlers/const.py b/zha/zigbee/cluster_handlers/const.py deleted file mode 100644 index f8b041d05..000000000 --- a/zha/zigbee/cluster_handlers/const.py +++ /dev/null @@ -1,121 +0,0 @@ -"""Constants for the cluster_handlers module.""" - -from typing import Final - -REPORT_CONFIG_ATTR_PER_REQ: Final[int] = 3 -REPORT_CONFIG_MAX_INT: Final[int] = 900 -REPORT_CONFIG_MAX_INT_BATTERY_SAVE: Final[int] = 10800 -REPORT_CONFIG_MIN_INT: Final[int] = 30 -REPORT_CONFIG_MIN_INT_ASAP: Final[int] = 1 -REPORT_CONFIG_MIN_INT_IMMEDIATE: Final[int] = 0 -REPORT_CONFIG_MIN_INT_OP: Final[int] = 5 -REPORT_CONFIG_MIN_INT_BATTERY_SAVE: Final[int] = 3600 -REPORT_CONFIG_RPT_CHANGE: Final[int] = 1 -REPORT_CONFIG_DEFAULT: tuple[int, int, int] = ( - REPORT_CONFIG_MIN_INT, - REPORT_CONFIG_MAX_INT, - REPORT_CONFIG_RPT_CHANGE, -) -REPORT_CONFIG_ASAP: tuple[int, int, int] = ( - REPORT_CONFIG_MIN_INT_ASAP, - REPORT_CONFIG_MAX_INT, - REPORT_CONFIG_RPT_CHANGE, -) -REPORT_CONFIG_BATTERY_SAVE: tuple[int, int, int] = ( - REPORT_CONFIG_MIN_INT_BATTERY_SAVE, - REPORT_CONFIG_MAX_INT_BATTERY_SAVE, - REPORT_CONFIG_RPT_CHANGE, -) -REPORT_CONFIG_IMMEDIATE: tuple[int, int, int] = ( - REPORT_CONFIG_MIN_INT_IMMEDIATE, - REPORT_CONFIG_MAX_INT, - REPORT_CONFIG_RPT_CHANGE, -) -REPORT_CONFIG_OP: tuple[int, int, int] = ( - REPORT_CONFIG_MIN_INT_OP, - REPORT_CONFIG_MAX_INT, - REPORT_CONFIG_RPT_CHANGE, -) -CLUSTER_READS_PER_REQ: Final[int] = 5 - -CLUSTER_HANDLER_ACCELEROMETER: Final[str] = "accelerometer" -CLUSTER_HANDLER_BINARY_INPUT: Final[str] = "binary_input" -CLUSTER_HANDLER_BINARY_OUTPUT: Final[str] = "binary_output" -CLUSTER_HANDLER_ANALOG_INPUT: Final[str] = "analog_input" -CLUSTER_HANDLER_ANALOG_OUTPUT: Final[str] = "analog_output" -CLUSTER_HANDLER_ATTRIBUTE: Final[str] = "attribute" -CLUSTER_HANDLER_BALLAST: Final[str] = "light_ballast" -CLUSTER_HANDLER_BASIC: Final[str] = "basic" -CLUSTER_HANDLER_COLOR: Final[str] = "light_color" -CLUSTER_HANDLER_COVER: Final[str] = "window_covering" -CLUSTER_HANDLER_DIAGNOSTIC: Final[str] = "diagnostic" -CLUSTER_HANDLER_DEVICE_TEMPERATURE: Final[str] = "device_temperature" -CLUSTER_HANDLER_DOORLOCK: Final[str] = "door_lock" -CLUSTER_HANDLER_ELECTRICAL_CONDUCTIVITY: Final[str] = "electrical_conductivity" -CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT: Final[str] = "electrical_measurement" -CLUSTER_HANDLER_EVENT_RELAY: Final[str] = "event_relay" -CLUSTER_HANDLER_FAN: Final[str] = "fan" -CLUSTER_HANDLER_FLOW: Final[str] = "flow" -CLUSTER_HANDLER_HUMIDITY: Final[str] = "humidity" -CLUSTER_HANDLER_SOIL_MOISTURE: Final[str] = "soil_moisture" -CLUSTER_HANDLER_LEAF_WETNESS: Final[str] = "leaf_wetness" -CLUSTER_HANDLER_IAS_ACE: Final[str] = "ias_ace" -CLUSTER_HANDLER_IAS_WD: Final[str] = "ias_wd" -CLUSTER_HANDLER_IDENTIFY: Final[str] = "identify" -CLUSTER_HANDLER_ILLUMINANCE: Final[str] = "illuminance" -CLUSTER_HANDLER_LEVEL: Final[str] = "level" -CLUSTER_HANDLER_MULTISTATE_INPUT: Final[str] = "multistate_input" -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" -CLUSTER_HANDLER_SMARTENERGY_METERING: Final[str] = "smartenergy_metering" -CLUSTER_HANDLER_TEMPERATURE: Final[str] = "temperature" -CLUSTER_HANDLER_THERMOSTAT: Final[str] = "thermostat" -CLUSTER_HANDLER_WIND_SPEED: Final[str] = "wind_speed" -CLUSTER_HANDLER_ZDO: Final[str] = "zdo" -CLUSTER_HANDLER_ZONE: Final[str] = "ias_zone" -ZONE: Final[str] = CLUSTER_HANDLER_ZONE -CLUSTER_HANDLER_INOVELLI = "inovelli_vzm31sn_cluster" - -AQARA_OPPLE_CLUSTER: Final[int] = 0xFCC0 -IKEA_AIR_PURIFIER_CLUSTER: Final[int] = 0xFC7D -IKEA_REMOTE_CLUSTER: Final[int] = 0xFC80 -IKEA_SHORTCUT_V1_CLUSTER: Final[int] = 0xFC7F -INOVELLI_CLUSTER: Final[int] = 0xFC31 -OSRAM_BUTTON_CLUSTER: Final[int] = 0xFD00 -PHILIPS_CONTACT_CLUSTER: Final[int] = 0xFC06 -PHILLIPS_REMOTE_CLUSTER: Final[int] = 0xFC00 -SMARTTHINGS_ACCELERATION_CLUSTER: Final[int] = 0xFC02 -SMARTTHINGS_HUMIDITY_CLUSTER: Final[int] = 0xFC45 -SONOFF_CLUSTER: Final[int] = 0xFC11 -TUYA_MANUFACTURER_CLUSTER: Final[int] = 0xEF00 -VOC_LEVEL_CLUSTER: Final[int] = 0x042E -SINOPE_MANUFACTURER_CLUSTER: Final[int] = 0xFF01 -LEGRAND_CABLE_OUTLET_CLUSTER: Final[int] = 0xFC40 - -CLUSTER_HANDLER_EVENT: Final[str] = "cluster_handler_event" -CLUSTER_HANDLER_ATTRIBUTE_UPDATED: Final[str] = "cluster_handler_attribute_updated" -CLUSTER_HANDLER_STATE_CHANGED: Final[str] = "cluster_handler_state_changed" -CLUSTER_HANDLER_LEVEL_CHANGED: Final[str] = "cluster_handler_level_changed" - -ATTRIBUTE_ID: Final[str] = "attribute_id" -ATTRIBUTE_NAME: Final[str] = "attribute_name" -ATTRIBUTE_VALUE: Final[str] = "attribute_value" - -UNIQUE_ID: Final[str] = "unique_id" -CLUSTER_ID: Final[str] = "cluster_id" -COMMAND: Final[str] = "command" -ARGS: Final[str] = "args" -PARAMS: Final[str] = "params" - -SIGNAL_ATTR_UPDATED: Final[str] = "attribute_updated" -SIGNAL_MOVE_LEVEL: Final[str] = "move_level" -SIGNAL_REMOVE: Final[str] = "remove" -SIGNAL_SET_LEVEL: Final[str] = "set_level" -SIGNAL_STATE_ATTR: Final[str] = "update_state_attribute" -UNKNOWN: Final[str] = "unknown" -VALUE: Final[str] = "value" diff --git a/zha/zigbee/cluster_handlers/general.py b/zha/zigbee/cluster_handlers/general.py deleted file mode 100644 index b3a13defa..000000000 --- a/zha/zigbee/cluster_handlers/general.py +++ /dev/null @@ -1,791 +0,0 @@ -"""General cluster handlers module for Zigbee Home Automation.""" - -from __future__ import annotations - -import asyncio -from collections.abc import Coroutine -from dataclasses import dataclass -from typing import TYPE_CHECKING, Any, Final - -from zhaquirks.quirk_ids import BEGA_LIGHT_SWITCHABLE_WHITE, TUYA_PLUG_ONOFF -import zigpy.exceptions -import zigpy.types as t -import zigpy.zcl -from zigpy.zcl import ( - AttributeReadEvent, - AttributeReportedEvent, - AttributeUpdatedEvent, - AttributeWrittenEvent, -) -from zigpy.zcl.clusters.general import ( - Alarms, - AnalogInput, - AnalogOutput, - AnalogValue, - ApplianceControl, - Basic, - BinaryInput, - BinaryOutput, - BinaryValue, - Commissioning, - DeviceTemperature, - GreenPowerProxy, - Groups, - Identify, - LevelControl, - MultistateInput, - MultistateOutput, - MultistateValue, - OnOff, - OnOffConfiguration, - Ota, - Partition, - PowerConfiguration, - PowerProfile, - RSSILocation, - Scenes, - Time, -) -from zigpy.zcl.clusters.general_const import ApplicationType -from zigpy.zcl.foundation import Status - -from zha.exceptions import ZHAException -from zha.zigbee.cluster_handlers import ( - AttrReportConfig, - ClientClusterHandler, - ClusterHandler, - parse_and_log_command, - registries, -) -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_LEVEL_CHANGED, - REPORT_CONFIG_ASAP, - REPORT_CONFIG_BATTERY_SAVE, - REPORT_CONFIG_DEFAULT, - REPORT_CONFIG_IMMEDIATE, - REPORT_CONFIG_MAX_INT, - REPORT_CONFIG_MIN_INT, - SIGNAL_MOVE_LEVEL, - SIGNAL_SET_LEVEL, -) -from zha.zigbee.cluster_handlers.helpers import is_hue_motion_sensor - -if TYPE_CHECKING: - from zha.zigbee.endpoint import Endpoint - - -@dataclass(frozen=True, kw_only=True) -class LevelChangeEvent: - """Event to signal that a cluster attribute has been updated.""" - - level: int - event: str - event_type: Final[str] = "cluster_handler_event" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Alarms.cluster_id) -class AlarmsClusterHandler(ClusterHandler): - """Alarms cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(AnalogInput.cluster_id) -class AnalogInputClusterHandler(ClusterHandler): - """Analog Input cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=AnalogInput.AttributeDefs.present_value.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - ZCL_INIT_ATTRS = { - AnalogInput.AttributeDefs.description.name: True, - AnalogInput.AttributeDefs.max_present_value.name: True, - AnalogInput.AttributeDefs.min_present_value.name: True, - AnalogInput.AttributeDefs.out_of_service.name: True, - AnalogInput.AttributeDefs.reliability.name: True, - AnalogInput.AttributeDefs.resolution.name: True, - AnalogInput.AttributeDefs.status_flags.name: True, - AnalogInput.AttributeDefs.engineering_units.name: True, - AnalogInput.AttributeDefs.application_type.name: True, - } - - @property - def present_value(self) -> float | None: - """Return cached value of present_value.""" - return self.cluster.get(AnalogInput.AttributeDefs.present_value.name) - - @property - def description(self) -> str | None: - """Return cached value of description.""" - return self.cluster.get(AnalogInput.AttributeDefs.description.name) - - @property - def max_present_value(self) -> float | None: - """Return cached value of max_present_value.""" - return self.cluster.get(AnalogInput.AttributeDefs.max_present_value.name) - - @property - def min_present_value(self) -> float | None: - """Return cached value of min_present_value.""" - return self.cluster.get(AnalogInput.AttributeDefs.min_present_value.name) - - @property - def out_of_service(self) -> bool | None: - """Return cached value of out_of_service.""" - return self.cluster.get(AnalogInput.AttributeDefs.out_of_service.name) - - @property - def reliability(self) -> int | None: - """Return cached value of reliability.""" - return self.cluster.get(AnalogInput.AttributeDefs.reliability.name) - - @property - def resolution(self) -> float | None: - """Return cached value of resolution.""" - return self.cluster.get(AnalogInput.AttributeDefs.resolution.name) - - @property - def status_flags(self) -> int | None: - """Return cached value of status_flags.""" - return self.cluster.get(AnalogInput.AttributeDefs.status_flags.name) - - @property - def engineering_units(self) -> int | None: - """Return cached value of engineering_units.""" - return self.cluster.get(AnalogInput.AttributeDefs.engineering_units.name) - - @property - def application_type(self) -> ApplicationType | None: - """Return cached value of application_type.""" - result = self.cluster.get(AnalogInput.AttributeDefs.application_type.name) - if result is None: - return None - return ApplicationType(result) - - async def async_update(self): - """Update cluster value attribute.""" - await self.get_attribute_value( - AnalogInput.AttributeDefs.present_value.name, from_cache=False - ) - - -@registries.BINDABLE_CLUSTERS.register(AnalogOutput.cluster_id) -@registries.CLUSTER_HANDLER_REGISTRY.register(AnalogOutput.cluster_id) -class AnalogOutputClusterHandler(ClusterHandler): - """Analog Output cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=AnalogOutput.AttributeDefs.present_value.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - ZCL_INIT_ATTRS = { - AnalogOutput.AttributeDefs.min_present_value.name: True, - AnalogOutput.AttributeDefs.max_present_value.name: True, - AnalogOutput.AttributeDefs.resolution.name: True, - AnalogOutput.AttributeDefs.relinquish_default.name: True, - AnalogOutput.AttributeDefs.description.name: True, - AnalogOutput.AttributeDefs.engineering_units.name: True, - AnalogOutput.AttributeDefs.application_type.name: True, - } - - @property - def present_value(self) -> float | None: - """Return cached value of present_value.""" - return self.cluster.get(AnalogOutput.AttributeDefs.present_value.name) - - @property - def min_present_value(self) -> float | None: - """Return cached value of min_present_value.""" - return self.cluster.get(AnalogOutput.AttributeDefs.min_present_value.name) - - @property - def max_present_value(self) -> float | None: - """Return cached value of max_present_value.""" - return self.cluster.get(AnalogOutput.AttributeDefs.max_present_value.name) - - @property - def resolution(self) -> float | None: - """Return cached value of resolution.""" - return self.cluster.get(AnalogOutput.AttributeDefs.resolution.name) - - @property - def relinquish_default(self) -> float | None: - """Return cached value of relinquish_default.""" - return self.cluster.get(AnalogOutput.AttributeDefs.relinquish_default.name) - - @property - def description(self) -> str | None: - """Return cached value of description.""" - return self.cluster.get(AnalogOutput.AttributeDefs.description.name) - - @property - def engineering_units(self) -> int | None: - """Return cached value of engineering_units.""" - return self.cluster.get(AnalogOutput.AttributeDefs.engineering_units.name) - - @property - def application_type(self) -> int | None: - """Return cached value of application_type.""" - return self.cluster.get(AnalogOutput.AttributeDefs.application_type.name) - - async def async_set_present_value(self, value: float) -> None: - """Update present_value.""" - await self.write_attributes_safe( - {AnalogOutput.AttributeDefs.present_value.name: value} - ) - - async def async_update(self): - """Update cluster value attribute.""" - await self.get_attribute_value( - AnalogOutput.AttributeDefs.present_value.name, from_cache=False - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(AnalogValue.cluster_id) -class AnalogValueClusterHandler(ClusterHandler): - """Analog Value cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=AnalogValue.AttributeDefs.present_value.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(ApplianceControl.cluster_id) -class ApplianceControlClusterHandler(ClusterHandler): - """Appliance Control cluster handler.""" - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(Basic.cluster_id) -@registries.CLUSTER_HANDLER_REGISTRY.register(Basic.cluster_id) -class BasicClusterHandler(ClusterHandler): - """Cluster handler to interact with the basic cluster.""" - - UNKNOWN = 0 - BATTERY = 3 - BIND: bool = False - - POWER_SOURCES = { - UNKNOWN: "Unknown", - 1: "Mains (single phase)", - 2: "Mains (3 phase)", - BATTERY: "Battery", - 4: "DC source", - 5: "Emergency mains constantly powered", - 6: "Emergency mains and transfer switch", - } - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize Basic cluster handler.""" - super().__init__(cluster, endpoint) - if is_hue_motion_sensor(self) and self.cluster.endpoint.endpoint_id == 2: - self.ZCL_INIT_ATTRS = self.ZCL_INIT_ATTRS.copy() - self.ZCL_INIT_ATTRS["trigger_indicator"] = True - elif ( - self.cluster.endpoint.manufacturer == "TexasInstruments" - and self.cluster.endpoint.model == "ti.router" - ): - self.ZCL_INIT_ATTRS = self.ZCL_INIT_ATTRS.copy() - self.ZCL_INIT_ATTRS["transmit_power"] = True - elif self.cluster.endpoint.model == "lumi.curtain.agl001": - self.ZCL_INIT_ATTRS = self.ZCL_INIT_ATTRS.copy() - self.ZCL_INIT_ATTRS["power_source"] = True - - -@registries.CLUSTER_HANDLER_REGISTRY.register(BinaryInput.cluster_id) -class BinaryInputClusterHandler(ClusterHandler): - """Binary Input cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=BinaryInput.AttributeDefs.present_value.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - ) - - ZCL_INIT_ATTRS = { - BinaryInput.AttributeDefs.description.name: True, - } - - @property - def description(self) -> str | None: - """Return cached value of description.""" - return self.cluster.get(BinaryInput.AttributeDefs.description.name) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(BinaryOutput.cluster_id) -class BinaryOutputClusterHandler(ClusterHandler): - """Binary Output cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=BinaryOutput.AttributeDefs.present_value.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - ) - - ZCL_INIT_ATTRS = { - BinaryOutput.AttributeDefs.description.name: True, - } - - @property - def description(self) -> str | None: - """Return cached value of description.""" - return self.cluster.get(BinaryOutput.AttributeDefs.description.name) - - @property - def present_value(self) -> bool | None: - """Return cached value of present_value.""" - return self.cluster.get(BinaryOutput.AttributeDefs.present_value.name) - - async def async_set_present_value(self, value: bool) -> None: - """Update present_value.""" - await self.write_attributes_safe( - {BinaryOutput.AttributeDefs.present_value.name: value} - ) - - async def async_update(self): - """Update cluster value attribute.""" - await self.get_attribute_value( - BinaryOutput.AttributeDefs.present_value.name, from_cache=False - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(BinaryValue.cluster_id) -class BinaryValueClusterHandler(ClusterHandler): - """Binary Value cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=BinaryValue.AttributeDefs.present_value.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Commissioning.cluster_id) -class CommissioningClusterHandler(ClusterHandler): - """Commissioning cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(DeviceTemperature.cluster_id) -class DeviceTemperatureClusterHandler(ClusterHandler): - """Device Temperature cluster handler.""" - - REPORT_CONFIG = ( - { - "attr": DeviceTemperature.AttributeDefs.current_temperature.name, - "config": (REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 50), - }, - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(GreenPowerProxy.cluster_id) -class GreenPowerProxyClusterHandler(ClusterHandler): - """Green Power Proxy cluster handler.""" - - BIND: bool = False - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Groups.cluster_id) -class GroupsClusterHandler(ClusterHandler): - """Groups cluster handler.""" - - BIND: bool = False - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Identify.cluster_id) -class IdentifyClusterHandler(ClusterHandler): - """Identify cluster handler.""" - - BIND: bool = False - - def cluster_command(self, tsn, command_id, args): - """Handle commands received to this cluster.""" - cmd = parse_and_log_command(self, tsn, command_id, args) - - if cmd == Identify.ServerCommandDefs.trigger_effect.name: - self.emit_zha_event(f"{self.unique_id}_{cmd}", args[0]) - - -@registries.CLIENT_CLUSTER_HANDLER_REGISTRY.register(LevelControl.cluster_id) -class LevelControlClientClusterHandler(ClientClusterHandler): - """LevelControl client cluster.""" - - -@registries.BINDABLE_CLUSTERS.register(LevelControl.cluster_id) -@registries.CLUSTER_HANDLER_REGISTRY.register(LevelControl.cluster_id) -class LevelControlClusterHandler(ClusterHandler): - """Cluster handler for the LevelControl Zigbee cluster.""" - - CURRENT_LEVEL = 0 - REPORT_CONFIG = ( - AttrReportConfig( - attr=LevelControl.AttributeDefs.current_level.name, - config=REPORT_CONFIG_ASAP, - ), - ) - ZCL_INIT_ATTRS = { - LevelControl.AttributeDefs.on_off_transition_time.name: True, - LevelControl.AttributeDefs.on_level.name: True, - LevelControl.AttributeDefs.on_transition_time.name: True, - LevelControl.AttributeDefs.off_transition_time.name: True, - LevelControl.AttributeDefs.default_move_rate.name: True, - LevelControl.AttributeDefs.start_up_current_level.name: True, - } - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize LevelControlClusterHandler.""" - super().__init__(cluster, endpoint) - - if BEGA_LIGHT_SWITCHABLE_WHITE in endpoint.device.exposes_features: - self.ZCL_INIT_ATTRS = self.ZCL_INIT_ATTRS.copy() - self.ZCL_INIT_ATTRS["switchable_white"] = True - self.ZCL_INIT_ATTRS["switchable_color_temperature_1"] = True - self.ZCL_INIT_ATTRS["switchable_color_temperature_2"] = True - - @property - def current_level(self) -> int | None: - """Return cached value of the current_level attribute.""" - return self.cluster.get(LevelControl.AttributeDefs.current_level.name) - - def cluster_command(self, tsn, command_id, args): - """Handle commands received to this cluster.""" - cmd = parse_and_log_command(self, tsn, command_id, args) - - if cmd in ( - LevelControl.ServerCommandDefs.move_to_level.name, - LevelControl.ServerCommandDefs.move_to_level_with_on_off.name, - ): - self.dispatch_level_change(SIGNAL_SET_LEVEL, args[0]) - elif cmd in ( - LevelControl.ServerCommandDefs.move.name, - LevelControl.ServerCommandDefs.move_with_on_off.name, - ): - # We should dim slowly -- for now, just step once - rate = args[1] - if args[0] == 0xFF: - rate = 10 # Should read default move rate - self.dispatch_level_change(SIGNAL_MOVE_LEVEL, -rate if args[0] else rate) - elif cmd in ( - LevelControl.ServerCommandDefs.step.name, - LevelControl.ServerCommandDefs.step_with_on_off.name, - ): - # Step (technically may change on/off) - self.dispatch_level_change( - SIGNAL_MOVE_LEVEL, -args[1] if args[0] else args[1] - ) - - def _handle_attribute_updated_event( - self, - event: AttributeReadEvent - | AttributeReportedEvent - | AttributeUpdatedEvent - | AttributeWrittenEvent, - ) -> None: - """Handle attribute updates on this cluster.""" - self.debug( - "received attribute: %s update with value: %s", - event.attribute_id, - event.value, - ) - if event.attribute_id == self.CURRENT_LEVEL: - self.dispatch_level_change(SIGNAL_SET_LEVEL, event.value) - else: - super()._handle_attribute_updated_event(event) - - def dispatch_level_change(self, command, level): - """Dispatch level change.""" - self.emit( - CLUSTER_HANDLER_LEVEL_CHANGED, - LevelChangeEvent( - level=level, - event=f"cluster_handler_{command}", - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(MultistateInput.cluster_id) -class MultistateInputClusterHandler(ClusterHandler): - """Multistate Input cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=MultistateInput.AttributeDefs.present_value.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(MultistateOutput.cluster_id) -class MultistateOutputClusterHandler(ClusterHandler): - """Multistate Output cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=MultistateOutput.AttributeDefs.present_value.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(MultistateValue.cluster_id) -class MultistateValueClusterHandler(ClusterHandler): - """Multistate Value cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=MultistateValue.AttributeDefs.present_value.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - - -@registries.CLIENT_CLUSTER_HANDLER_REGISTRY.register(OnOff.cluster_id) -class OnOffClientClusterHandler(ClientClusterHandler): - """OnOff client cluster handler.""" - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize OnOffClientClusterHandler.""" - super().__init__(cluster, endpoint) - self._off_listener: asyncio.TimerHandle | None = None - - @property - def on_off(self) -> bool | None: - """Return cached value of on/off attribute.""" - return self.cluster.get(OnOff.AttributeDefs.on_off.name) - - def cluster_command(self, tsn, command_id, args): - """Handle commands received to this cluster.""" - cmd = parse_and_log_command(self, tsn, command_id, args) - - # Process cluster commands, so attribute_updated events fire first - if cmd in ( - OnOff.ServerCommandDefs.off.name, - OnOff.ServerCommandDefs.off_with_effect.name, - ): - self.cluster.update_attribute(OnOff.AttributeDefs.on_off.id, t.Bool.false) - elif cmd in ( - OnOff.ServerCommandDefs.on.name, - OnOff.ServerCommandDefs.on_with_recall_global_scene.name, - ): - self.cluster.update_attribute(OnOff.AttributeDefs.on_off.id, t.Bool.true) - elif cmd == OnOff.ServerCommandDefs.on_with_timed_off.name: - should_accept = args[0] - on_time = args[1] - # 0 is always accept 1 is only accept when already on - if should_accept == 0 or (should_accept == 1 and bool(self.on_off)): - if self._off_listener is not None: - self._off_listener.cancel() - self._off_listener = None - self.cluster.update_attribute( - OnOff.AttributeDefs.on_off.id, t.Bool.true - ) - if on_time > 0: - self._off_listener = asyncio.get_running_loop().call_later( - (on_time / 10), # value is in 10ths of a second - self.set_to_off, - ) - elif cmd == "toggle": - self.cluster.update_attribute( - OnOff.AttributeDefs.on_off.id, not bool(self.on_off) - ) - - # Emit ZHA event with cluster command - super().cluster_command(tsn, command_id, args) - - def set_to_off(self, *_): - """Set the state to off.""" - self._off_listener = None - self.cluster.update_attribute(OnOff.AttributeDefs.on_off.id, t.Bool.false) - - -@registries.BINDABLE_CLUSTERS.register(OnOff.cluster_id) -@registries.CLUSTER_HANDLER_REGISTRY.register(OnOff.cluster_id) -class OnOffClusterHandler(ClusterHandler): - """Cluster handler for the OnOff Zigbee cluster.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=OnOff.AttributeDefs.on_off.name, config=REPORT_CONFIG_IMMEDIATE - ), - ) - ZCL_INIT_ATTRS = { - OnOff.AttributeDefs.start_up_on_off.name: True, - } - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize OnOffClusterHandler.""" - super().__init__(cluster, endpoint) - - if TUYA_PLUG_ONOFF in endpoint.device.exposes_features: - self.ZCL_INIT_ATTRS = self.ZCL_INIT_ATTRS.copy() - self.ZCL_INIT_ATTRS["backlight_mode"] = True - self.ZCL_INIT_ATTRS["power_on_state"] = True - self.ZCL_INIT_ATTRS["child_lock"] = True - - @classmethod - def matches(cls, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> bool: - """Filter the cluster match for specific devices.""" - return not ( - cluster.endpoint.device.manufacturer == "Konke" - and cluster.endpoint.device.model - in ("3AFE280100510001", "3AFE170100510001") - ) - - @property - def on_off(self) -> bool | None: - """Return cached value of on/off attribute.""" - return self.cluster.get(OnOff.AttributeDefs.on_off.name) - - async def turn_on(self) -> None: - """Turn the on off cluster on.""" - result = await self.on() - if result[1] is not Status.SUCCESS: - raise ZHAException(f"Failed to turn on: {result[1]}") - self.cluster.update_attribute(OnOff.AttributeDefs.on_off.id, t.Bool.true) - - async def turn_off(self) -> None: - """Turn the on off cluster off.""" - result = await self.off() - if result[1] is not Status.SUCCESS: - raise ZHAException(f"Failed to turn off: {result[1]}") - self.cluster.update_attribute(OnOff.AttributeDefs.on_off.id, t.Bool.false) - - async def async_update(self): - """Initialize cluster handler.""" - if self.cluster.is_client: - return - from_cache = not self._endpoint.device.is_mains_powered - self.debug("attempting to update onoff state - from cache: %s", from_cache) - await self.get_attribute_value( - OnOff.AttributeDefs.on_off.name, from_cache=from_cache - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(OnOffConfiguration.cluster_id) -class OnOffConfigurationClusterHandler(ClusterHandler): - """OnOff Configuration cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Ota.cluster_id) -class OtaClusterHandler(ClusterHandler): - """OTA cluster handler.""" - - BIND: bool = False - - # Some devices have this cluster in the wrong collection (e.g. Third Reality) - ZCL_INIT_ATTRS = { - Ota.AttributeDefs.current_file_version.name: True, - } - - @property - def current_file_version(self) -> int | None: - """Return cached value of current_file_version attribute.""" - return self.cluster.get(Ota.AttributeDefs.current_file_version.name) - - -@registries.CLIENT_CLUSTER_HANDLER_REGISTRY.register(Ota.cluster_id) -class OtaClientClusterHandler(ClientClusterHandler): - """OTA client cluster handler.""" - - BIND: bool = False - - ZCL_INIT_ATTRS = { - Ota.AttributeDefs.current_file_version.name: True, - } - - @property - def current_file_version(self) -> int | None: - """Return cached value of current_file_version attribute.""" - return self.cluster.get(Ota.AttributeDefs.current_file_version.name) - - def _handle_attribute_updated_event( - self, - event: AttributeReadEvent - | AttributeReportedEvent - | AttributeUpdatedEvent - | AttributeWrittenEvent, - ) -> None: - """Handle an attribute updated on this cluster.""" - # We intentionally avoid the `ClientClusterHandler` attribute update handler: - # it emits a logbook event on every update, which pollutes the logbook - ClusterHandler._handle_attribute_updated_event(self, event) - - def cluster_command( - self, tsn: int, command_id: int, args: list[Any] | None - ) -> None: - """Handle OTA commands.""" - if command_id not in self.cluster.server_commands: - return - - cmd_name = self.cluster.server_commands[command_id].name - - if cmd_name == Ota.ServerCommandDefs.query_next_image.name: - assert args - - current_file_version = args[3] - self.cluster.update_attribute( - Ota.AttributeDefs.current_file_version.id, current_file_version - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Partition.cluster_id) -class PartitionClusterHandler(ClusterHandler): - """Partition cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(PowerConfiguration.cluster_id) -class PowerConfigurationClusterHandler(ClusterHandler): - """Cluster handler for the zigbee power configuration cluster.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=PowerConfiguration.AttributeDefs.battery_voltage.name, - config=REPORT_CONFIG_BATTERY_SAVE, - ), - AttrReportConfig( - attr=PowerConfiguration.AttributeDefs.battery_percentage_remaining.name, - config=REPORT_CONFIG_BATTERY_SAVE, - ), - ) - - def async_initialize_cluster_handler_specific(self, from_cache: bool) -> Coroutine: - """Initialize cluster handler specific attrs.""" - attributes = [ - PowerConfiguration.AttributeDefs.battery_size.name, - PowerConfiguration.AttributeDefs.battery_quantity.name, - ] - return self.get_attributes( - attributes, from_cache=from_cache, only_cache=from_cache - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(PowerProfile.cluster_id) -class PowerProfileClusterHandler(ClusterHandler): - """Power Profile cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(RSSILocation.cluster_id) -class RSSILocationClusterHandler(ClusterHandler): - """RSSI Location cluster handler.""" - - -@registries.CLIENT_CLUSTER_HANDLER_REGISTRY.register(Scenes.cluster_id) -class ScenesClientClusterHandler(ClientClusterHandler): - """Scenes cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Scenes.cluster_id) -class ScenesClusterHandler(ClusterHandler): - """Scenes cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Time.cluster_id) -class TimeClusterHandler(ClusterHandler): - """Time cluster handler.""" diff --git a/zha/zigbee/cluster_handlers/helpers.py b/zha/zigbee/cluster_handlers/helpers.py deleted file mode 100644 index e34238b4b..000000000 --- a/zha/zigbee/cluster_handlers/helpers.py +++ /dev/null @@ -1,23 +0,0 @@ -"""Helpers for use with ZHA Zigbee cluster handlers.""" - -from zha.zigbee.cluster_handlers import ClusterHandler - - -def is_hue_motion_sensor(cluster_handler: ClusterHandler) -> bool: - """Return true if the manufacturer and model match known Hue motion sensor models.""" - return cluster_handler.cluster.endpoint.manufacturer in ( - "Philips", - "Signify Netherlands B.V.", - ) and cluster_handler.cluster.endpoint.model in ( - "SML001", - "SML002", - "SML003", - "SML004", - ) - - -def is_sonoff_presence_sensor(cluster_handler: ClusterHandler) -> bool: - """Return true if the manufacturer and model match known Sonoff sensor models.""" - return cluster_handler.cluster.endpoint.manufacturer in ( - "SONOFF", - ) and cluster_handler.cluster.endpoint.model in ("SNZB-06P", "SNZB-03P") diff --git a/zha/zigbee/cluster_handlers/homeautomation.py b/zha/zigbee/cluster_handlers/homeautomation.py deleted file mode 100644 index f8c85b9f2..000000000 --- a/zha/zigbee/cluster_handlers/homeautomation.py +++ /dev/null @@ -1,404 +0,0 @@ -"""Home automation cluster handlers module for Zigbee Home Automation.""" - -from __future__ import annotations - -import enum - -from zigpy.zcl.clusters.homeautomation import ( - ApplianceEventAlerts, - ApplianceIdentification, - ApplianceStatistics, - Diagnostic, - ElectricalMeasurement, - MeterIdentification, -) - -from zha.zigbee.cluster_handlers import AttrReportConfig, ClusterHandler, registries -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT, - REPORT_CONFIG_IMMEDIATE, - REPORT_CONFIG_OP, -) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(ApplianceEventAlerts.cluster_id) -class ApplianceEventAlertsClusterHandler(ClusterHandler): - """Appliance Event Alerts cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(ApplianceIdentification.cluster_id) -class ApplianceIdentificationClusterHandler(ClusterHandler): - """Appliance Identification cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(ApplianceStatistics.cluster_id) -class ApplianceStatisticsClusterHandler(ClusterHandler): - """Appliance Statistics cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Diagnostic.cluster_id) -class DiagnosticClusterHandler(ClusterHandler): - """Diagnostic cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(ElectricalMeasurement.cluster_id) -class ElectricalMeasurementClusterHandler(ClusterHandler): - """Cluster handler that polls active power level.""" - - CLUSTER_HANDLER_NAME = CLUSTER_HANDLER_ELECTRICAL_MEASUREMENT - - class MeasurementType(enum.IntFlag): - """Measurement types.""" - - ACTIVE_MEASUREMENT = 1 - REACTIVE_MEASUREMENT = 2 - APPARENT_MEASUREMENT = 4 - PHASE_A_MEASUREMENT = 8 - PHASE_B_MEASUREMENT = 16 - PHASE_C_MEASUREMENT = 32 - DC_MEASUREMENT = 64 - HARMONICS_MEASUREMENT = 128 - POWER_QUALITY_MEASUREMENT = 256 - - REPORT_CONFIG = ( - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.ac_voltage_multiplier.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.ac_voltage_divisor.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.ac_current_multiplier.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.ac_current_divisor.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.ac_power_multiplier.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.ac_power_divisor.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.power_multiplier.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.power_divisor.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.active_power.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.active_power_ph_b.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.active_power_ph_c.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.total_active_power.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.apparent_power.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.rms_current.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.rms_current_ph_b.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.rms_current_ph_c.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.rms_voltage.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.rms_voltage_ph_b.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.rms_voltage_ph_c.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.ac_frequency.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.dc_voltage_multiplier.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.dc_voltage_divisor.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.dc_current_multiplier.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.dc_current_divisor.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.dc_power_multiplier.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.dc_power_divisor.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.dc_voltage.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.dc_current.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=ElectricalMeasurement.AttributeDefs.dc_power.name, - config=REPORT_CONFIG_OP, - ), - ) - ZCL_POLLING_ATTRS = [ - ElectricalMeasurement.AttributeDefs.ac_frequency.name, - ElectricalMeasurement.AttributeDefs.ac_frequency_max.name, - ElectricalMeasurement.AttributeDefs.active_power.name, - ElectricalMeasurement.AttributeDefs.active_power_ph_b.name, - ElectricalMeasurement.AttributeDefs.active_power_ph_c.name, - ElectricalMeasurement.AttributeDefs.active_power_max.name, - ElectricalMeasurement.AttributeDefs.active_power_max_ph_b.name, - ElectricalMeasurement.AttributeDefs.active_power_max_ph_c.name, - ElectricalMeasurement.AttributeDefs.total_active_power.name, - ElectricalMeasurement.AttributeDefs.apparent_power.name, - ElectricalMeasurement.AttributeDefs.power_factor.name, - ElectricalMeasurement.AttributeDefs.power_factor_ph_b.name, - ElectricalMeasurement.AttributeDefs.power_factor_ph_c.name, - ElectricalMeasurement.AttributeDefs.rms_current.name, - ElectricalMeasurement.AttributeDefs.rms_current_ph_b.name, - ElectricalMeasurement.AttributeDefs.rms_current_ph_c.name, - ElectricalMeasurement.AttributeDefs.rms_current_max.name, - ElectricalMeasurement.AttributeDefs.rms_current_max_ph_b.name, - ElectricalMeasurement.AttributeDefs.rms_current_max_ph_c.name, - ElectricalMeasurement.AttributeDefs.rms_voltage.name, - ElectricalMeasurement.AttributeDefs.rms_voltage_ph_b.name, - ElectricalMeasurement.AttributeDefs.rms_voltage_ph_c.name, - ElectricalMeasurement.AttributeDefs.rms_voltage_max.name, - ElectricalMeasurement.AttributeDefs.rms_voltage_max_ph_b.name, - ElectricalMeasurement.AttributeDefs.rms_voltage_max_ph_c.name, - ElectricalMeasurement.AttributeDefs.dc_voltage.name, - ElectricalMeasurement.AttributeDefs.dc_current.name, - ElectricalMeasurement.AttributeDefs.dc_power.name, - ] - ZCL_INIT_ATTRS = { - ElectricalMeasurement.AttributeDefs.ac_frequency_divisor.name: True, - ElectricalMeasurement.AttributeDefs.ac_frequency_max.name: True, - ElectricalMeasurement.AttributeDefs.ac_frequency_multiplier.name: True, - ElectricalMeasurement.AttributeDefs.active_power_max.name: True, - ElectricalMeasurement.AttributeDefs.active_power_max_ph_b.name: True, - ElectricalMeasurement.AttributeDefs.active_power_max_ph_c.name: True, - ElectricalMeasurement.AttributeDefs.measurement_type.name: True, - ElectricalMeasurement.AttributeDefs.power_factor.name: True, - ElectricalMeasurement.AttributeDefs.power_factor_ph_b.name: True, - ElectricalMeasurement.AttributeDefs.power_factor_ph_c.name: True, - ElectricalMeasurement.AttributeDefs.rms_current_max.name: True, - ElectricalMeasurement.AttributeDefs.rms_current_max_ph_b.name: True, - ElectricalMeasurement.AttributeDefs.rms_current_max_ph_c.name: True, - ElectricalMeasurement.AttributeDefs.rms_voltage_max.name: True, - ElectricalMeasurement.AttributeDefs.rms_voltage_max_ph_b.name: True, - ElectricalMeasurement.AttributeDefs.rms_voltage_max_ph_c.name: True, - ElectricalMeasurement.AttributeDefs.dc_voltage_divisor.name: True, - ElectricalMeasurement.AttributeDefs.dc_voltage_multiplier.name: True, - ElectricalMeasurement.AttributeDefs.dc_current_divisor.name: True, - ElectricalMeasurement.AttributeDefs.dc_current_multiplier.name: True, - ElectricalMeasurement.AttributeDefs.dc_power_divisor.name: True, - ElectricalMeasurement.AttributeDefs.dc_power_multiplier.name: True, - } - - async def async_update(self): - """Retrieve latest state.""" - self.debug("async_update") - - # This is a polling cluster handler. Don't allow cache. - attrs = [ - attr - for attr in self.ZCL_POLLING_ATTRS - if not self.cluster.is_attribute_unsupported(attr) - ] - await self.get_attributes(attrs, from_cache=False, only_cache=False) - - @property - def ac_current_divisor(self) -> int: - """Return ac current divisor.""" - return ( - self.cluster.get( - ElectricalMeasurement.AttributeDefs.ac_current_divisor.name - ) - or 1 - ) - - @property - def ac_current_multiplier(self) -> int: - """Return ac current multiplier.""" - return ( - self.cluster.get( - ElectricalMeasurement.AttributeDefs.ac_current_multiplier.name - ) - or 1 - ) - - @property - def ac_voltage_divisor(self) -> int: - """Return ac voltage divisor.""" - return ( - self.cluster.get( - ElectricalMeasurement.AttributeDefs.ac_voltage_divisor.name - ) - or 1 - ) - - @property - def ac_voltage_multiplier(self) -> int: - """Return ac voltage multiplier.""" - return ( - self.cluster.get( - ElectricalMeasurement.AttributeDefs.ac_voltage_multiplier.name - ) - or 1 - ) - - @property - def ac_frequency_divisor(self) -> int: - """Return ac frequency divisor.""" - return ( - self.cluster.get( - ElectricalMeasurement.AttributeDefs.ac_frequency_divisor.name - ) - or 1 - ) - - @property - def ac_frequency_multiplier(self) -> int: - """Return ac frequency multiplier.""" - return ( - self.cluster.get( - ElectricalMeasurement.AttributeDefs.ac_frequency_multiplier.name - ) - or 1 - ) - - @property - def ac_power_divisor(self) -> int: - """Return active power divisor.""" - return self.cluster.get( - ElectricalMeasurement.AttributeDefs.ac_power_divisor.name, - self.cluster.get(ElectricalMeasurement.AttributeDefs.power_divisor.name) - or 1, - ) - - @property - def ac_power_multiplier(self) -> int: - """Return active power multiplier.""" - return self.cluster.get( - ElectricalMeasurement.AttributeDefs.ac_power_multiplier.name, - self.cluster.get(ElectricalMeasurement.AttributeDefs.power_multiplier.name) - or 1, - ) - - @property - def dc_voltage_divisor(self) -> int: - """Return DC voltage divisor.""" - return ( - self.cluster.get( - ElectricalMeasurement.AttributeDefs.dc_voltage_divisor.name - ) - or 1 - ) - - @property - def dc_voltage_multiplier(self) -> int: - """Return DC voltage multiplier.""" - return ( - self.cluster.get( - ElectricalMeasurement.AttributeDefs.dc_voltage_multiplier.name - ) - or 1 - ) - - @property - def dc_current_divisor(self) -> int: - """Return DC current divisor.""" - return ( - self.cluster.get( - ElectricalMeasurement.AttributeDefs.dc_current_divisor.name - ) - or 1 - ) - - @property - def dc_current_multiplier(self) -> int: - """Return DC current multiplier.""" - return ( - self.cluster.get( - ElectricalMeasurement.AttributeDefs.dc_current_multiplier.name - ) - or 1 - ) - - @property - def dc_power_divisor(self) -> int: - """Return DC power divisor.""" - return self.cluster.get( - ElectricalMeasurement.AttributeDefs.dc_power_divisor.name, - self.cluster.get(ElectricalMeasurement.AttributeDefs.power_divisor.name) - or 1, - ) - - @property - def dc_power_multiplier(self) -> int: - """Return DC power multiplier.""" - return self.cluster.get( - ElectricalMeasurement.AttributeDefs.dc_power_multiplier.name, - self.cluster.get(ElectricalMeasurement.AttributeDefs.power_multiplier.name) - or 1, - ) - - @property - def measurement_type(self) -> str | None: - """Return Measurement type.""" - if ( - meas_type := self.cluster.get( - ElectricalMeasurement.AttributeDefs.measurement_type.name - ) - ) is None: - return None - - meas_type = self.MeasurementType(meas_type) - return ", ".join( - m.name - for m in self.MeasurementType - if m in meas_type and m.name is not None - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(MeterIdentification.cluster_id) -class MeterIdentificationClusterHandler(ClusterHandler): - """Metering Identification cluster handler.""" diff --git a/zha/zigbee/cluster_handlers/hvac.py b/zha/zigbee/cluster_handlers/hvac.py deleted file mode 100644 index 2e1d5d6c4..000000000 --- a/zha/zigbee/cluster_handlers/hvac.py +++ /dev/null @@ -1,317 +0,0 @@ -"""HVAC cluster handlers module for Zigbee Home Automation.""" - -from __future__ import annotations - -from zigpy.zcl.clusters.hvac import ( - Dehumidification, - Fan, - Pump, - Thermostat, - UserInterface, -) - -from zha.zigbee.cluster_handlers import AttrReportConfig, ClusterHandler, registries -from zha.zigbee.cluster_handlers.const import ( - REPORT_CONFIG_MAX_INT, - REPORT_CONFIG_MIN_INT, - REPORT_CONFIG_OP, -) - -REPORT_CONFIG_CLIMATE = (REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 25) -REPORT_CONFIG_CLIMATE_DEMAND = (REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 5) -REPORT_CONFIG_CLIMATE_DISCRETE = (REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 1) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Dehumidification.cluster_id) -class DehumidificationClusterHandler(ClusterHandler): - """Dehumidification cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Fan.cluster_id) -class FanClusterHandler(ClusterHandler): - """Fan cluster handler.""" - - _value_attribute: str = Fan.AttributeDefs.fan_mode.name - - REPORT_CONFIG = ( - AttrReportConfig(attr=Fan.AttributeDefs.fan_mode.name, config=REPORT_CONFIG_OP), - ) - ZCL_INIT_ATTRS = {Fan.AttributeDefs.fan_mode_sequence.name: True} - - @property - def fan_mode(self) -> int | None: - """Return current fan mode.""" - return self.cluster.get(Fan.AttributeDefs.fan_mode.name) - - @property - def fan_mode_sequence(self) -> int | None: - """Return possible fan mode speeds.""" - return self.cluster.get(Fan.AttributeDefs.fan_mode_sequence.name) - - async def async_set_speed(self, value) -> None: - """Set the speed of the fan.""" - await self.write_attributes_safe({Fan.AttributeDefs.fan_mode.name: value}) - - async def async_update(self) -> None: - """Retrieve latest state.""" - await self.get_attribute_value( - Fan.AttributeDefs.fan_mode.name, from_cache=False - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Pump.cluster_id) -class PumpClusterHandler(ClusterHandler): - """Pump cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Thermostat.cluster_id) -class ThermostatClusterHandler(ClusterHandler): - """Thermostat cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=Thermostat.AttributeDefs.local_temperature.name, - config=REPORT_CONFIG_CLIMATE, - ), - AttrReportConfig( - attr=Thermostat.AttributeDefs.occupied_cooling_setpoint.name, - config=REPORT_CONFIG_CLIMATE, - ), - AttrReportConfig( - attr=Thermostat.AttributeDefs.occupied_heating_setpoint.name, - config=REPORT_CONFIG_CLIMATE, - ), - AttrReportConfig( - attr=Thermostat.AttributeDefs.unoccupied_cooling_setpoint.name, - config=REPORT_CONFIG_CLIMATE, - ), - AttrReportConfig( - attr=Thermostat.AttributeDefs.unoccupied_heating_setpoint.name, - config=REPORT_CONFIG_CLIMATE, - ), - AttrReportConfig( - attr=Thermostat.AttributeDefs.running_mode.name, - config=REPORT_CONFIG_CLIMATE_DISCRETE, - ), - AttrReportConfig( - attr=Thermostat.AttributeDefs.running_state.name, - config=REPORT_CONFIG_CLIMATE_DISCRETE, - ), - AttrReportConfig( - attr=Thermostat.AttributeDefs.system_mode.name, - config=REPORT_CONFIG_CLIMATE_DISCRETE, - ), - AttrReportConfig( - attr=Thermostat.AttributeDefs.occupancy.name, - config=REPORT_CONFIG_CLIMATE_DISCRETE, - ), - AttrReportConfig( - attr=Thermostat.AttributeDefs.pi_cooling_demand.name, - config=REPORT_CONFIG_CLIMATE_DEMAND, - ), - AttrReportConfig( - attr=Thermostat.AttributeDefs.pi_heating_demand.name, - config=REPORT_CONFIG_CLIMATE_DEMAND, - ), - ) - ZCL_INIT_ATTRS: dict[str, bool] = { - Thermostat.AttributeDefs.abs_min_heat_setpoint_limit.name: True, - Thermostat.AttributeDefs.abs_max_heat_setpoint_limit.name: True, - Thermostat.AttributeDefs.abs_min_cool_setpoint_limit.name: True, - Thermostat.AttributeDefs.abs_max_cool_setpoint_limit.name: True, - Thermostat.AttributeDefs.ctrl_sequence_of_oper.name: False, - Thermostat.AttributeDefs.max_cool_setpoint_limit.name: True, - Thermostat.AttributeDefs.max_heat_setpoint_limit.name: True, - Thermostat.AttributeDefs.min_cool_setpoint_limit.name: True, - Thermostat.AttributeDefs.min_heat_setpoint_limit.name: True, - Thermostat.AttributeDefs.local_temperature_calibration.name: True, - Thermostat.AttributeDefs.setpoint_change_source.name: True, - Thermostat.AttributeDefs.setpoint_change_source_timestamp.name: True, - } - - @property - def abs_max_cool_setpoint_limit(self) -> int: - """Absolute maximum cooling setpoint.""" - return self.cluster.get( - Thermostat.AttributeDefs.abs_max_cool_setpoint_limit.name, 3200 - ) - - @property - def abs_min_cool_setpoint_limit(self) -> int: - """Absolute minimum cooling setpoint.""" - return self.cluster.get( - Thermostat.AttributeDefs.abs_min_cool_setpoint_limit.name, 1600 - ) - - @property - def abs_max_heat_setpoint_limit(self) -> int: - """Absolute maximum heating setpoint.""" - return self.cluster.get( - Thermostat.AttributeDefs.abs_max_heat_setpoint_limit.name, 3000 - ) - - @property - def abs_min_heat_setpoint_limit(self) -> int: - """Absolute minimum heating setpoint.""" - return self.cluster.get( - Thermostat.AttributeDefs.abs_min_heat_setpoint_limit.name, 700 - ) - - @property - def ctrl_sequence_of_oper(self) -> int: - """Control Sequence of operations attribute.""" - return self.cluster.get( - Thermostat.AttributeDefs.ctrl_sequence_of_oper.name, 0xFF - ) - - @property - def max_cool_setpoint_limit(self) -> int: - """Maximum cooling setpoint.""" - sp_limit = self.cluster.get( - Thermostat.AttributeDefs.max_cool_setpoint_limit.name - ) - if sp_limit is None: - return self.abs_max_cool_setpoint_limit - return sp_limit - - @property - def min_cool_setpoint_limit(self) -> int: - """Minimum cooling setpoint.""" - sp_limit = self.cluster.get( - Thermostat.AttributeDefs.min_cool_setpoint_limit.name - ) - if sp_limit is None: - return self.abs_min_cool_setpoint_limit - return sp_limit - - @property - def max_heat_setpoint_limit(self) -> int: - """Maximum heating setpoint.""" - sp_limit = self.cluster.get( - Thermostat.AttributeDefs.max_heat_setpoint_limit.name - ) - if sp_limit is None: - return self.abs_max_heat_setpoint_limit - return sp_limit - - @property - def min_heat_setpoint_limit(self) -> int: - """Minimum heating setpoint.""" - sp_limit = self.cluster.get( - Thermostat.AttributeDefs.min_heat_setpoint_limit.name - ) - if sp_limit is None: - return self.abs_min_heat_setpoint_limit - return sp_limit - - @property - def local_temperature(self) -> int | None: - """Thermostat temperature.""" - return self.cluster.get(Thermostat.AttributeDefs.local_temperature.name) - - @property - def outdoor_temperature(self) -> int | None: - """Thermostat outdoor temperature.""" - return self.cluster.get(Thermostat.AttributeDefs.outdoor_temperature.name) - - @property - def occupancy(self) -> int | None: - """Is occupancy detected.""" - return self.cluster.get(Thermostat.AttributeDefs.occupancy.name) - - @property - def occupied_cooling_setpoint(self) -> int | None: - """Temperature when room is occupied.""" - return self.cluster.get(Thermostat.AttributeDefs.occupied_cooling_setpoint.name) - - @property - def occupied_heating_setpoint(self) -> int | None: - """Temperature when room is occupied.""" - return self.cluster.get(Thermostat.AttributeDefs.occupied_heating_setpoint.name) - - @property - def pi_cooling_demand(self) -> int | None: - """Cooling demand.""" - return self.cluster.get(Thermostat.AttributeDefs.pi_cooling_demand.name) - - @property - def pi_heating_demand(self) -> int | None: - """Heating demand.""" - return self.cluster.get(Thermostat.AttributeDefs.pi_heating_demand.name) - - @property - def running_mode(self) -> int | None: - """Thermostat running mode.""" - return self.cluster.get(Thermostat.AttributeDefs.running_mode.name) - - @property - def running_state(self) -> int | None: - """Thermostat running state, state of heat, cool, fan relays.""" - return self.cluster.get(Thermostat.AttributeDefs.running_state.name) - - @property - def system_mode(self) -> int | None: - """System mode.""" - return self.cluster.get(Thermostat.AttributeDefs.system_mode.name) - - @property - def unoccupied_cooling_setpoint(self) -> int | None: - """Temperature when room is not occupied.""" - return self.cluster.get( - Thermostat.AttributeDefs.unoccupied_cooling_setpoint.name - ) - - @property - def unoccupied_heating_setpoint(self) -> int | None: - """Temperature when room is not occupied.""" - return self.cluster.get( - Thermostat.AttributeDefs.unoccupied_heating_setpoint.name - ) - - async def async_set_operation_mode(self, mode) -> bool: - """Set Operation mode.""" - await self.write_attributes_safe( - {Thermostat.AttributeDefs.system_mode.name: mode} - ) - return True - - async def async_set_heating_setpoint( - self, temperature: int, is_away: bool = False - ) -> bool: - """Set heating setpoint.""" - attr = ( - Thermostat.AttributeDefs.unoccupied_heating_setpoint.name - if is_away - else Thermostat.AttributeDefs.occupied_heating_setpoint.name - ) - await self.write_attributes_safe({attr: temperature}) - return True - - async def async_set_cooling_setpoint( - self, temperature: int, is_away: bool = False - ) -> bool: - """Set cooling setpoint.""" - attr = ( - Thermostat.AttributeDefs.unoccupied_cooling_setpoint.name - if is_away - else Thermostat.AttributeDefs.occupied_cooling_setpoint.name - ) - await self.write_attributes_safe({attr: temperature}) - return True - - async def get_occupancy(self) -> bool | None: - """Get unreportable occupancy attribute.""" - res, fail = await self.read_attributes( - [Thermostat.AttributeDefs.occupancy.name] - ) - self.debug("read 'occupancy' attr, success: %s, fail: %s", res, fail) - if Thermostat.AttributeDefs.occupancy.name not in res: - return None - return bool(self.occupancy) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(UserInterface.cluster_id) -class UserInterfaceClusterHandler(ClusterHandler): - """User interface (thermostat) cluster handler.""" - - ZCL_INIT_ATTRS = {UserInterface.AttributeDefs.keypad_lockout.name: True} diff --git a/zha/zigbee/cluster_handlers/lighting.py b/zha/zigbee/cluster_handlers/lighting.py deleted file mode 100644 index 6220f2312..000000000 --- a/zha/zigbee/cluster_handlers/lighting.py +++ /dev/null @@ -1,168 +0,0 @@ -"""Lighting cluster handlers module for Zigbee Home Automation.""" - -from __future__ import annotations - -from zigpy.zcl.clusters.lighting import Ballast, Color - -from zha.zigbee.cluster_handlers import ( - AttrReportConfig, - ClientClusterHandler, - ClusterHandler, - registries, -) -from zha.zigbee.cluster_handlers.const import REPORT_CONFIG_DEFAULT - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Ballast.cluster_id) -class BallastClusterHandler(ClusterHandler): - """Ballast cluster handler.""" - - ZCL_INIT_ATTRS = { - Ballast.AttributeDefs.min_level.name: True, - Ballast.AttributeDefs.max_level.name: True, - } - - -@registries.CLIENT_CLUSTER_HANDLER_REGISTRY.register(Color.cluster_id) -class ColorClientClusterHandler(ClientClusterHandler): - """Color client cluster handler.""" - - -@registries.BINDABLE_CLUSTERS.register(Color.cluster_id) -@registries.CLUSTER_HANDLER_REGISTRY.register(Color.cluster_id) -class ColorClusterHandler(ClusterHandler): - """Color cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=Color.AttributeDefs.current_x.name, - config=REPORT_CONFIG_DEFAULT, - ), - AttrReportConfig( - attr=Color.AttributeDefs.current_y.name, - config=REPORT_CONFIG_DEFAULT, - ), - AttrReportConfig( - attr=Color.AttributeDefs.color_temperature.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - MAX_MIREDS: int = 500 - MIN_MIREDS: int = 153 - ZCL_INIT_ATTRS = { - Color.AttributeDefs.color_mode.name: False, - Color.AttributeDefs.color_temp_physical_min.name: True, - Color.AttributeDefs.color_temp_physical_max.name: True, - Color.AttributeDefs.color_capabilities.name: True, - Color.AttributeDefs.color_loop_active.name: False, - Color.AttributeDefs.start_up_color_temperature.name: True, - Color.AttributeDefs.options.name: True, - } - - @property - def color_capabilities(self) -> Color.ColorCapabilities: - """Return ZCL color capabilities of the light.""" - color_capabilities = self.cluster.get( - Color.AttributeDefs.color_capabilities.name - ) - if color_capabilities is None: - return Color.ColorCapabilities.XY_attributes - return Color.ColorCapabilities(color_capabilities) - - @property - def color_mode(self) -> int | None: - """Return cached value of the color_mode attribute.""" - return self.cluster.get(Color.AttributeDefs.color_mode.name) - - @property - def color_loop_active(self) -> int | None: - """Return cached value of the color_loop_active attribute.""" - return self.cluster.get(Color.AttributeDefs.color_loop_active.name) - - @property - def color_temperature(self) -> int | None: - """Return cached value of color temperature.""" - return self.cluster.get(Color.AttributeDefs.color_temperature.name) - - @property - def current_x(self) -> int | None: - """Return cached value of the current_x attribute.""" - return self.cluster.get(Color.AttributeDefs.current_x.name) - - @property - def current_y(self) -> int | None: - """Return cached value of the current_y attribute.""" - return self.cluster.get(Color.AttributeDefs.current_y.name) - - @property - def current_saturation(self) -> int | None: - """Return cached value of the current_saturation attribute.""" - return self.cluster.get(Color.AttributeDefs.current_saturation.name) - - @property - def min_mireds(self) -> int: - """Return the coldest color_temp that this cluster handler supports.""" - min_mireds = self.cluster.get( - Color.AttributeDefs.color_temp_physical_min.name, self.MIN_MIREDS - ) - if min_mireds == 0: - self.warning( - ( - "[Min mireds is 0, setting to %s] Please open an issue on the" - " quirks repo to have this device corrected" - ), - self.MIN_MIREDS, - ) - min_mireds = self.MIN_MIREDS - return min_mireds - - @property - def max_mireds(self) -> int: - """Return the warmest color_temp that this cluster handler supports.""" - max_mireds = self.cluster.get( - Color.AttributeDefs.color_temp_physical_max.name, self.MAX_MIREDS - ) - if max_mireds == 0: - self.warning( - ( - "[Max mireds is 0, setting to %s] Please open an issue on the" - " quirks repo to have this device corrected" - ), - self.MAX_MIREDS, - ) - max_mireds = self.MAX_MIREDS - return max_mireds - - @property - def xy_supported(self) -> bool: - """Return True if the cluster handler supports xy.""" - return ( - self.color_capabilities is not None - and Color.ColorCapabilities.XY_attributes in self.color_capabilities - ) - - @property - def color_temp_supported(self) -> bool: - """Return True if the cluster handler supports color temperature.""" - return ( - self.color_capabilities is not None - and Color.ColorCapabilities.Color_temperature in self.color_capabilities - ) or self.color_temperature is not None - - @property - def color_loop_supported(self) -> bool: - """Return True if the cluster handler supports color loop.""" - return ( - self.color_capabilities is not None - and Color.ColorCapabilities.Color_loop in self.color_capabilities - ) - - @property - def options(self) -> Color.Options: - """Return ZCL options of the cluster handler.""" - return Color.Options(self.cluster.get(Color.AttributeDefs.options.name, 0)) - - @property - def execute_if_off_supported(self) -> bool: - """Return True if the cluster handler can execute commands when off.""" - return Color.Options.Execute_if_off in self.options diff --git a/zha/zigbee/cluster_handlers/lightlink.py b/zha/zigbee/cluster_handlers/lightlink.py deleted file mode 100644 index ae63174cb..000000000 --- a/zha/zigbee/cluster_handlers/lightlink.py +++ /dev/null @@ -1,47 +0,0 @@ -"""Lightlink cluster handlers module for Zigbee Home Automation.""" - -import zigpy.exceptions -from zigpy.zcl.clusters.lightlink import LightLink -from zigpy.zcl.foundation import GENERAL_COMMANDS, GeneralCommand - -from zha.zigbee.cluster_handlers import ClusterHandler, ClusterHandlerStatus, registries - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(LightLink.cluster_id) -@registries.CLUSTER_HANDLER_REGISTRY.register(LightLink.cluster_id) -class LightLinkClusterHandler(ClusterHandler): - """Lightlink cluster handler.""" - - BIND: bool = False - - async def async_configure(self) -> None: - """Add Coordinator to LightLink group.""" - - if self._endpoint.device.skip_configuration: - self._status = ClusterHandlerStatus.CONFIGURED - return - - application = self._endpoint.zigpy_endpoint.device.application - try: - coordinator = application.get_device(application.state.node_info.ieee) - except KeyError: - self.warning("Aborting - unable to locate required coordinator device.") - return - - try: - rsp = await self.cluster.get_group_identifiers(0) - except (zigpy.exceptions.ZigbeeException, TimeoutError) as exc: - self.warning("Couldn't get list of groups: %s", str(exc)) - return - - if isinstance(rsp, GENERAL_COMMANDS[GeneralCommand.Default_Response].schema): - groups = [] - else: - groups = rsp.group_info_records - - if groups: - for group in groups: - self.debug("Adding coordinator to 0x%04x group id", group.group_id) - await coordinator.add_to_group(group.group_id) - else: - await coordinator.add_to_group(0x0000, name="Lightlink Group") diff --git a/zha/zigbee/cluster_handlers/manufacturerspecific.py b/zha/zigbee/cluster_handlers/manufacturerspecific.py deleted file mode 100644 index 96aea9d6c..000000000 --- a/zha/zigbee/cluster_handlers/manufacturerspecific.py +++ /dev/null @@ -1,661 +0,0 @@ -"""Manufacturer specific cluster handlers module for Zigbee Home Automation.""" - -from __future__ import annotations - -import logging -from typing import TYPE_CHECKING, Any - -from zhaquirks.inovelli.types import AllLEDEffectType, SingleLEDEffectType -from zhaquirks.quirk_ids import ( - DANFOSS_ALLY_THERMOSTAT, - TUYA_PLUG_MANUFACTURER, - XIAOMI_AQARA_VIBRATION_AQ1, -) -import zigpy.zcl -from zigpy.zcl import ( - AttributeReadEvent, - AttributeReportedEvent, - AttributeUpdatedEvent, - AttributeWrittenEvent, -) -from zigpy.zcl.clusters.closures import DoorLock -from zigpy.zcl.clusters.homeautomation import Diagnostic -from zigpy.zcl.clusters.hvac import Thermostat, UserInterface - -from zha.zigbee.cluster_handlers import ( - AttrReportConfig, - ClientClusterHandler, - ClusterHandler, - registries, -) -from zha.zigbee.cluster_handlers.const import ( - AQARA_OPPLE_CLUSTER, - ATTRIBUTE_ID, - ATTRIBUTE_NAME, - ATTRIBUTE_VALUE, - IKEA_AIR_PURIFIER_CLUSTER, - IKEA_REMOTE_CLUSTER, - IKEA_SHORTCUT_V1_CLUSTER, - INOVELLI_CLUSTER, - LEGRAND_CABLE_OUTLET_CLUSTER, - OSRAM_BUTTON_CLUSTER, - PHILIPS_CONTACT_CLUSTER, - PHILLIPS_REMOTE_CLUSTER, - REPORT_CONFIG_ASAP, - REPORT_CONFIG_DEFAULT, - REPORT_CONFIG_IMMEDIATE, - REPORT_CONFIG_MAX_INT, - REPORT_CONFIG_MIN_INT, - REPORT_CONFIG_MIN_INT_IMMEDIATE, - REPORT_CONFIG_RPT_CHANGE, - SIGNAL_ATTR_UPDATED, - SINOPE_MANUFACTURER_CLUSTER, - SMARTTHINGS_ACCELERATION_CLUSTER, - SMARTTHINGS_HUMIDITY_CLUSTER, - SONOFF_CLUSTER, - TUYA_MANUFACTURER_CLUSTER, - UNKNOWN, -) -from zha.zigbee.cluster_handlers.general import MultistateInputClusterHandler - -from .homeautomation import DiagnosticClusterHandler -from .hvac import ThermostatClusterHandler, UserInterfaceClusterHandler - -if TYPE_CHECKING: - from zha.zigbee.endpoint import Endpoint - -_LOGGER = logging.getLogger(__name__) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(SMARTTHINGS_HUMIDITY_CLUSTER) -class SmartThingsHumidityClusterHandler(ClusterHandler): - """Smart Things Humidity cluster handler.""" - - REPORT_CONFIG = ( - { - "attr": "measured_value", - "config": (REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 50), - }, - ) - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(OSRAM_BUTTON_CLUSTER) -@registries.CLUSTER_HANDLER_REGISTRY.register(OSRAM_BUTTON_CLUSTER) -class OsramButtonClusterHandler(ClusterHandler): - """Osram button cluster handler.""" - - REPORT_CONFIG = () - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(PHILIPS_CONTACT_CLUSTER) -@registries.CLUSTER_HANDLER_REGISTRY.register(PHILIPS_CONTACT_CLUSTER) -class PhillipsContactClusterHandler(ClusterHandler): - """Phillips contact cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig(attr="contact", config=REPORT_CONFIG_IMMEDIATE), - AttrReportConfig(attr="tamper", config=REPORT_CONFIG_IMMEDIATE), - ) - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(PHILLIPS_REMOTE_CLUSTER) -@registries.CLUSTER_HANDLER_REGISTRY.register(PHILLIPS_REMOTE_CLUSTER) -class PhillipsRemoteClusterHandler(ClusterHandler): - """Phillips remote cluster handler.""" - - REPORT_CONFIG = () - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(TUYA_MANUFACTURER_CLUSTER) -@registries.CLUSTER_HANDLER_REGISTRY.register(TUYA_MANUFACTURER_CLUSTER) -class TuyaClusterHandler(ClusterHandler): - """Cluster handler for the Tuya manufacturer Zigbee cluster.""" - - REPORT_CONFIG = () - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize TuyaClusterHandler.""" - super().__init__(cluster, endpoint) - if TUYA_PLUG_MANUFACTURER in endpoint.device.exposes_features: - self.ZCL_INIT_ATTRS = { - "backlight_mode": True, - "power_on_state": True, - } - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(AQARA_OPPLE_CLUSTER) -@registries.CLUSTER_HANDLER_REGISTRY.register(AQARA_OPPLE_CLUSTER) -class OppleRemoteClusterHandler(ClusterHandler): - """Opple cluster handler.""" - - REPORT_CONFIG: tuple[AttrReportConfig, ...] = () - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize Opple cluster handler.""" - super().__init__(cluster, endpoint) - if self.cluster.endpoint.model == "lumi.motion.ac02": - self.ZCL_INIT_ATTRS = { - "detection_interval": True, - "motion_sensitivity": True, - "trigger_indicator": True, - } - elif self.cluster.endpoint.model == "lumi.motion.agl04": - self.ZCL_INIT_ATTRS = { - "detection_interval": True, - "motion_sensitivity": True, - } - elif self.cluster.endpoint.model == "lumi.motion.ac01": - self.ZCL_INIT_ATTRS = { - "presence": True, - "monitoring_mode": True, - "motion_sensitivity": True, - "approach_distance": True, - } - elif self.cluster.endpoint.model in ("lumi.plug.mmeu01", "lumi.plug.maeu01"): - self.ZCL_INIT_ATTRS = { - "power_outage_memory": True, - "consumer_connected": True, - } - elif self.cluster.endpoint.model == "aqara.feeder.acn001": - self.ZCL_INIT_ATTRS = { - "portions_dispensed": True, - "weight_dispensed": True, - "error_detected": True, - "disable_led_indicator": True, - "child_lock": True, - "feeding_mode": True, - "serving_size": True, - "portion_weight": True, - } - elif self.cluster.endpoint.model == "lumi.airrtc.agl001": - self.ZCL_INIT_ATTRS = { - "system_mode": True, - "preset": True, - "window_detection": True, - "valve_detection": True, - "valve_alarm": True, - "child_lock": True, - "away_preset_temperature": True, - "window_open": True, - "calibrated": True, - "schedule": True, - "sensor": True, - } - elif self.cluster.endpoint.model == "lumi.sensor_smoke.acn03": - self.ZCL_INIT_ATTRS = { - "buzzer_manual_mute": True, - "smoke_density": True, - "heartbeat_indicator": True, - "buzzer_manual_alarm": True, - "buzzer": True, - "linkage_alarm": True, - } - elif self.cluster.endpoint.model == "lumi.magnet.ac01": - self.ZCL_INIT_ATTRS = { - "detection_distance": True, - } - elif self.cluster.endpoint.model == "lumi.switch.acn047": - self.ZCL_INIT_ATTRS = { - "switch_mode": True, - "switch_type": True, - "startup_on_off": True, - "decoupled_mode": True, - } - elif self.cluster.endpoint.model == "lumi.curtain.agl001": - self.ZCL_INIT_ATTRS = { - "hooks_state": True, - "hooks_lock": True, - "positions_stored": True, - "light_level": True, - "hand_open": True, - } - - async def async_initialize_cluster_handler_specific(self, from_cache: bool) -> None: # pylint: disable=unused-argument - """Initialize cluster handler specific.""" - if self.cluster.endpoint.model in ("lumi.motion.ac02", "lumi.motion.agl04"): - interval = self.cluster.get("detection_interval", self.cluster.get(0x0102)) - if interval is not None: - self.debug("Loaded detection interval at startup: %s", interval) - self.cluster.endpoint.ias_zone.reset_s = int(interval) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(SMARTTHINGS_ACCELERATION_CLUSTER) -class SmartThingsAccelerationClusterHandler(ClusterHandler): - """Smart Things Acceleration cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig(attr="acceleration", config=REPORT_CONFIG_ASAP), - AttrReportConfig(attr="x_axis", config=REPORT_CONFIG_ASAP), - AttrReportConfig(attr="y_axis", config=REPORT_CONFIG_ASAP), - AttrReportConfig(attr="z_axis", config=REPORT_CONFIG_ASAP), - ) - - @classmethod - def matches(cls, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> bool: - """Filter the cluster match for specific devices.""" - return cluster.endpoint.device.manufacturer in ( - "CentraLite", - "Samjin", - "SmartThings", - ) - - def _handle_attribute_updated_event( - self, - event: AttributeReadEvent - | AttributeReportedEvent - | AttributeUpdatedEvent - | AttributeWrittenEvent, - ) -> None: - """Handle attribute updates on this cluster.""" - super()._handle_attribute_updated_event(event) - self.emit_zha_event( - SIGNAL_ATTR_UPDATED, - { - ATTRIBUTE_ID: event.attribute_id, - ATTRIBUTE_NAME: event.attribute_name or UNKNOWN, - ATTRIBUTE_VALUE: event.value, - }, - ) - - -@registries.CLIENT_CLUSTER_HANDLER_REGISTRY.register(INOVELLI_CLUSTER) -class InovelliNotificationClientClusterHandler(ClientClusterHandler): - """Inovelli Notification cluster handler.""" - - def _handle_attribute_updated_event( - self, - event: AttributeReadEvent - | AttributeReportedEvent - | AttributeUpdatedEvent - | AttributeWrittenEvent, - ) -> None: - """Handle an attribute updated on this cluster.""" - - def cluster_command(self, tsn, command_id, args): - """Handle a cluster command received on this cluster.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(INOVELLI_CLUSTER) -class InovelliConfigEntityClusterHandler(ClusterHandler): - """Inovelli Configuration Entity cluster handler.""" - - REPORT_CONFIG = () - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize Inovelli cluster handler.""" - super().__init__(cluster, endpoint) - if self.cluster.endpoint.model == "VZM30-SN": - self.ZCL_INIT_ATTRS = { - "dimming_speed_up_remote": True, - "dimming_speed_up_local": True, - "ramp_rate_off_to_on_remote": True, - "ramp_rate_off_to_on_local": True, - "dimming_speed_down_remote": True, - "dimming_speed_down_local": True, - "ramp_rate_on_to_off_remote": True, - "ramp_rate_on_to_off_local": True, - "minimum_level": True, - "maximum_level": True, - "invert_switch": True, - "auto_off_timer": True, - "default_level_local": True, - "default_level_remote": True, - "state_after_power_restored": True, - "load_level_indicator_timeout": True, - "active_power_reports": True, - "periodic_power_and_energy_reports": True, - "active_energy_reports": True, - "power_type": False, - "switch_type": False, - "internal_temp_monitor": True, - "overheated": True, - "button_delay": False, - "smart_bulb_mode": False, - "led_color_when_on": True, - "led_color_when_off": True, - "led_intensity_when_on": True, - "led_intensity_when_off": True, - "led_scaling_mode": True, - "aux_switch_scenes": True, - "binding_off_to_on_sync_level": True, - "local_protection": False, - "output_mode": False, - "firmware_progress_led": True, - "disable_clear_notifications_double_tap": True, - } - elif self.cluster.endpoint.model == "VZM31-SN": - self.ZCL_INIT_ATTRS = { - "dimming_speed_up_remote": True, - "dimming_speed_up_local": True, - "ramp_rate_off_to_on_remote": True, - "ramp_rate_off_to_on_local": True, - "dimming_speed_down_remote": True, - "dimming_speed_down_local": True, - "ramp_rate_on_to_off_remote": True, - "ramp_rate_on_to_off_local": True, - "minimum_level": True, - "maximum_level": True, - "invert_switch": True, - "auto_off_timer": True, - "default_level_local": True, - "default_level_remote": True, - "state_after_power_restored": True, - "load_level_indicator_timeout": True, - "active_power_reports": True, - "periodic_power_and_energy_reports": True, - "active_energy_reports": True, - "power_type": False, - "switch_type": False, - "quick_start_time": True, - "quick_start_level": True, - "increased_non_neutral_output": True, - "leading_or_trailing_edge": True, - "internal_temp_monitor": True, - "overheated": True, - "button_delay": False, - "smart_bulb_mode": False, - "double_tap_up_enabled": True, - "double_tap_down_enabled": True, - "double_tap_up_level": True, - "double_tap_down_level": True, - "led_color_when_on": True, - "led_color_when_off": True, - "led_intensity_when_on": True, - "led_intensity_when_off": True, - "led_scaling_mode": True, - "aux_switch_scenes": True, - "binding_off_to_on_sync_level": True, - "local_protection": False, - "output_mode": False, - "on_off_led_mode": True, - "firmware_progress_led": True, - "relay_click_in_on_off_mode": True, - "disable_clear_notifications_double_tap": True, - } - elif self.cluster.endpoint.model == "VZM35-SN": - self.ZCL_INIT_ATTRS = { - "dimming_speed_up_remote": True, - "dimming_speed_up_local": True, - "ramp_rate_off_to_on_local": True, - "ramp_rate_off_to_on_remote": True, - "dimming_speed_down_remote": True, - "dimming_speed_down_local": True, - "ramp_rate_on_to_off_local": True, - "ramp_rate_on_to_off_remote": True, - "minimum_level": True, - "maximum_level": True, - "invert_switch": True, - "auto_off_timer": True, - "default_level_local": True, - "default_level_remote": True, - "state_after_power_restored": True, - "load_level_indicator_timeout": True, - "power_type": False, - "switch_type": False, - "non_neutral_aux_med_gear_learn_value": True, - "non_neutral_aux_low_gear_learn_value": True, - "quick_start_time": False, - "button_delay": False, - "smart_fan_mode": False, - "double_tap_up_enabled": True, - "double_tap_down_enabled": True, - "double_tap_up_level": True, - "double_tap_down_level": True, - "led_color_when_on": True, - "led_color_when_off": True, - "led_intensity_when_on": True, - "led_intensity_when_off": True, - "aux_switch_scenes": True, - "local_protection": False, - "output_mode": False, - "on_off_led_mode": True, - "firmware_progress_led": True, - "smart_fan_led_display_levels": True, - } - - async def issue_all_led_effect( # pylint: disable=unused-argument - self, - effect_type: AllLEDEffectType | int = AllLEDEffectType.Fast_Blink, - color: int = 200, - level: int = 100, - duration: int = 3, - **kwargs: Any, - ) -> None: - """Issue all LED effect command. - - This command is used to issue an LED effect to all LEDs on the device. - """ - - await self.led_effect(effect_type, color, level, duration, expect_reply=False) - - async def issue_individual_led_effect( # pylint: disable=too-many-arguments,unused-argument - self, - led_number: int = 1, - effect_type: SingleLEDEffectType | int = SingleLEDEffectType.Fast_Blink, - color: int = 200, - level: int = 100, - duration: int = 3, - **kwargs: Any, - ) -> None: - """Issue individual LED effect command. - - This command is used to issue an LED effect to the specified LED on the device. - """ - - await self.individual_led_effect( - led_number, effect_type, color, level, duration, expect_reply=False - ) - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(IKEA_AIR_PURIFIER_CLUSTER) -@registries.CLUSTER_HANDLER_REGISTRY.register(IKEA_AIR_PURIFIER_CLUSTER) -class IkeaAirPurifierClusterHandler(ClusterHandler): - """IKEA Air Purifier cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig(attr="filter_run_time", config=REPORT_CONFIG_DEFAULT), - AttrReportConfig(attr="replace_filter", config=REPORT_CONFIG_IMMEDIATE), - AttrReportConfig(attr="filter_life_time", config=REPORT_CONFIG_DEFAULT), - AttrReportConfig(attr="disable_led", config=REPORT_CONFIG_IMMEDIATE), - AttrReportConfig(attr="air_quality_25pm", config=REPORT_CONFIG_IMMEDIATE), - AttrReportConfig(attr="child_lock", config=REPORT_CONFIG_IMMEDIATE), - AttrReportConfig(attr="fan_mode", config=REPORT_CONFIG_IMMEDIATE), - AttrReportConfig(attr="fan_speed", config=REPORT_CONFIG_IMMEDIATE), - AttrReportConfig(attr="device_run_time", config=REPORT_CONFIG_DEFAULT), - ) - - @property - def fan_mode(self) -> int | None: - """Return current fan mode.""" - return self.cluster.get("fan_mode") - - @property - def fan_speed(self) -> int | None: - """Return current fan speed.""" - return self.cluster.get("fan_speed") - - @property - def fan_mode_sequence(self) -> int | None: - """Return possible fan mode speeds.""" - return self.cluster.get("fan_mode_sequence") - - async def async_set_speed(self, value) -> None: - """Set the speed of the fan.""" - await self.write_attributes_safe({"fan_mode": value}) - - async def async_update(self) -> None: - """Retrieve latest state.""" - await self.get_attribute_value("fan_mode", from_cache=False) - await self.get_attribute_value("fan_speed", from_cache=False) - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(IKEA_REMOTE_CLUSTER) -@registries.CLIENT_CLUSTER_HANDLER_REGISTRY.register(IKEA_REMOTE_CLUSTER) -class IkeaRemoteClientClusterHandler(ClientClusterHandler): - """Ikea Matter remote cluster handler.""" - - REPORT_CONFIG = () - - def cluster_command(self, tsn, command_id, args): - """Handle a cluster command received on this cluster.""" - # Do not emit ZHA events when receiving a client command, this duplicates the - # existing event sent by the quirk. - pass - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(IKEA_SHORTCUT_V1_CLUSTER) -@registries.CLIENT_CLUSTER_HANDLER_REGISTRY.register(IKEA_SHORTCUT_V1_CLUSTER) -class IkeaSymfoniskRemoteClientClusterHandler(ClientClusterHandler): - """Ikea Symfonisk remote cluster handler.""" - - REPORT_CONFIG = () - - def cluster_command(self, tsn, command_id, args): - """Handle a cluster command received on this cluster.""" - # Do not emit ZHA events when receiving a client command, this duplicates the - # existing event sent by the quirk. - pass - - -@registries.CLUSTER_HANDLER_REGISTRY.register( - DoorLock.cluster_id, XIAOMI_AQARA_VIBRATION_AQ1 -) -class XiaomiVibrationAQ1ClusterHandler(MultistateInputClusterHandler): - """Xiaomi DoorLock Cluster is in fact a MultiStateInput Cluster.""" - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(SONOFF_CLUSTER) -@registries.CLUSTER_HANDLER_REGISTRY.register(SONOFF_CLUSTER) -class SonoffPresenceSenorClusterHandler(ClusterHandler): - """SonoffPresenceSensor cluster handler.""" - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize SonoffPresenceSensor cluster handler.""" - super().__init__(cluster, endpoint) - if self.cluster.endpoint.model == "SNZB-06P": - self.ZCL_INIT_ATTRS = {"last_illumination_state": True} - - -@registries.CLUSTER_HANDLER_REGISTRY.register( - Thermostat.cluster_id, DANFOSS_ALLY_THERMOSTAT -) -class DanfossThermostatClusterHandler(ThermostatClusterHandler): - """Thermostat cluster handler for the Danfoss TRV and derivatives.""" - - REPORT_CONFIG = ( # type: ignore[assignment] - *ThermostatClusterHandler.REPORT_CONFIG, - AttrReportConfig(attr="open_window_detection", config=REPORT_CONFIG_DEFAULT), - AttrReportConfig(attr="heat_required", config=REPORT_CONFIG_ASAP), - AttrReportConfig(attr="mounting_mode_active", config=REPORT_CONFIG_DEFAULT), - AttrReportConfig(attr="load_estimate", config=REPORT_CONFIG_DEFAULT), - AttrReportConfig(attr="adaptation_run_status", config=REPORT_CONFIG_DEFAULT), - AttrReportConfig(attr="preheat_status", config=REPORT_CONFIG_DEFAULT), - AttrReportConfig(attr="preheat_time", config=REPORT_CONFIG_DEFAULT), - ) - - ZCL_INIT_ATTRS = { - **ThermostatClusterHandler.ZCL_INIT_ATTRS, - "external_open_window_detected": True, - "window_open_feature": True, - "exercise_day_of_week": True, - "exercise_trigger_time": True, - "mounting_mode_control": False, # Can change - "orientation": True, - "external_measured_room_sensor": False, # Can change - "radiator_covered": True, - "heat_available": True, - "load_balancing_enable": True, - "load_room_mean": False, # Can change - "control_algorithm_scale_factor": True, - "regulation_setpoint_offset": True, - "adaptation_run_control": True, - "adaptation_run_settings": True, - } - - -@registries.CLUSTER_HANDLER_REGISTRY.register( - UserInterface.cluster_id, DANFOSS_ALLY_THERMOSTAT -) -class DanfossUserInterfaceClusterHandler(UserInterfaceClusterHandler): - """Interface cluster handler for the Danfoss TRV and derivatives.""" - - ZCL_INIT_ATTRS = { - **UserInterfaceClusterHandler.ZCL_INIT_ATTRS, - "viewing_direction": True, - } - - -@registries.CLUSTER_HANDLER_REGISTRY.register( - Diagnostic.cluster_id, DANFOSS_ALLY_THERMOSTAT -) -class DanfossDiagnosticClusterHandler(DiagnosticClusterHandler): - """Diagnostic cluster handler for the Danfoss TRV and derivatives.""" - - REPORT_CONFIG = ( - *DiagnosticClusterHandler.REPORT_CONFIG, - AttrReportConfig(attr="sw_error_code", config=REPORT_CONFIG_DEFAULT), - AttrReportConfig(attr="motor_step_counter", config=REPORT_CONFIG_DEFAULT), - ) - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(SINOPE_MANUFACTURER_CLUSTER) -@registries.CLUSTER_HANDLER_REGISTRY.register(SINOPE_MANUFACTURER_CLUSTER) -class SinopeManufacturerClusterHandler(ClusterHandler): - """Sinope Manufacturer cluster handler.""" - - BIND = True - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize Sinope cluster handler.""" - super().__init__(cluster, endpoint) - self.ZCL_INIT_ATTRS = { - "double_up_full": True, - "on_led_color": True, - "off_led_color": True, - "off_led_intensity": True, - "on_led_intensity": True, - } - - if self.cluster.endpoint.model in [ - "DM2550ZB", - "DM2550ZB-G2", - "DM2500ZB-G2", - "DM2500ZB", - ]: - self.ZCL_INIT_ATTRS["on_intensity"] = True - - _value_attribute = "action_report" - REPORT_CONFIG = ( - AttrReportConfig( - attr="action_report", - config=( - REPORT_CONFIG_MIN_INT_IMMEDIATE, - REPORT_CONFIG_MIN_INT_IMMEDIATE, - REPORT_CONFIG_RPT_CHANGE, - ), - ), - ) - - @classmethod - def matches(cls, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> bool: - """Filter the cluster match for specific devices.""" - switches = ( - "SW2500ZB", - "SW2500ZB-G2", - "DM2500ZB", - "DM2500ZB-G2", - "DM2550ZB", - "DM2550ZB-G2", - ) - - _LOGGER.debug( - "matching sinope device to cluster handler %s", cluster.endpoint.model - ) - - return cluster.endpoint.model in switches - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(LEGRAND_CABLE_OUTLET_CLUSTER) -@registries.CLUSTER_HANDLER_REGISTRY.register(LEGRAND_CABLE_OUTLET_CLUSTER) -class LegrandCableOutletClusterHandler(ClusterHandler): - """Legrand cable outlet cluster handler.""" diff --git a/zha/zigbee/cluster_handlers/measurement.py b/zha/zigbee/cluster_handlers/measurement.py deleted file mode 100644 index 86dc76ca6..000000000 --- a/zha/zigbee/cluster_handlers/measurement.py +++ /dev/null @@ -1,234 +0,0 @@ -"""Measurement cluster handlers module for Zigbee Home Automation.""" - -from __future__ import annotations - -from typing import TYPE_CHECKING - -import zigpy.zcl -from zigpy.zcl.clusters.measurement import ( - PM25, - CarbonDioxideConcentration, - CarbonMonoxideConcentration, - ElectricalConductivity, - FlowMeasurement, - FormaldehydeConcentration, - IlluminanceLevelSensing, - IlluminanceMeasurement, - LeafWetness, - OccupancySensing, - PressureMeasurement, - RelativeHumidity, - SoilMoisture, - TemperatureMeasurement, - WindSpeed, -) - -from zha.zigbee.cluster_handlers import AttrReportConfig, ClusterHandler, registries -from zha.zigbee.cluster_handlers.const import ( - REPORT_CONFIG_DEFAULT, - REPORT_CONFIG_IMMEDIATE, - REPORT_CONFIG_MAX_INT, - REPORT_CONFIG_MIN_INT, -) -from zha.zigbee.cluster_handlers.helpers import ( - is_hue_motion_sensor, - is_sonoff_presence_sensor, -) - -if TYPE_CHECKING: - from zha.zigbee.endpoint import Endpoint - - -@registries.CLUSTER_HANDLER_REGISTRY.register(FlowMeasurement.cluster_id) -class FlowMeasurementClusterHandler(ClusterHandler): - """Flow Measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=FlowMeasurement.AttributeDefs.measured_value.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(IlluminanceLevelSensing.cluster_id) -class IlluminanceLevelSensingClusterHandler(ClusterHandler): - """Illuminance Level Sensing cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=IlluminanceLevelSensing.AttributeDefs.level_status.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(IlluminanceMeasurement.cluster_id) -class IlluminanceMeasurementClusterHandler(ClusterHandler): - """Illuminance Measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=IlluminanceMeasurement.AttributeDefs.measured_value.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(OccupancySensing.cluster_id) -class OccupancySensingClusterHandler(ClusterHandler): - """Occupancy Sensing cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=OccupancySensing.AttributeDefs.occupancy.name, - config=REPORT_CONFIG_IMMEDIATE, - ), - ) - ZCL_INIT_ATTRS = { - "pir_o_to_u_delay": True, - "pir_u_to_o_delay": True, - } - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize Occupancy cluster handler.""" - super().__init__(cluster, endpoint) - if is_hue_motion_sensor(self): - self.ZCL_INIT_ATTRS = self.ZCL_INIT_ATTRS.copy() - self.ZCL_INIT_ATTRS["sensitivity"] = True - if is_sonoff_presence_sensor(self): - self.ZCL_INIT_ATTRS = self.ZCL_INIT_ATTRS.copy() - self.ZCL_INIT_ATTRS["ultrasonic_o_to_u_delay"] = True - self.ZCL_INIT_ATTRS["ultrasonic_u_to_o_threshold"] = True - - -@registries.CLUSTER_HANDLER_REGISTRY.register(PressureMeasurement.cluster_id) -class PressureMeasurementClusterHandler(ClusterHandler): - """Pressure measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=PressureMeasurement.AttributeDefs.measured_value.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(RelativeHumidity.cluster_id) -class RelativeHumidityClusterHandler(ClusterHandler): - """Relative Humidity measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=RelativeHumidity.AttributeDefs.measured_value.name, - config=(REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 100), - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(SoilMoisture.cluster_id) -class SoilMoistureClusterHandler(ClusterHandler): - """Soil Moisture measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=SoilMoisture.AttributeDefs.measured_value.name, - config=(REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 100), - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(LeafWetness.cluster_id) -class LeafWetnessClusterHandler(ClusterHandler): - """Leaf Wetness measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=LeafWetness.AttributeDefs.measured_value.name, - config=(REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 100), - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(TemperatureMeasurement.cluster_id) -class TemperatureMeasurementClusterHandler(ClusterHandler): - """Temperature measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=TemperatureMeasurement.AttributeDefs.measured_value.name, - config=(REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 50), - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(CarbonMonoxideConcentration.cluster_id) -class CarbonMonoxideConcentrationClusterHandler(ClusterHandler): - """Carbon Monoxide measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=CarbonMonoxideConcentration.AttributeDefs.measured_value.name, - config=(REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 0.000001), - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(CarbonDioxideConcentration.cluster_id) -class CarbonDioxideConcentrationClusterHandler(ClusterHandler): - """Carbon Dioxide measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=CarbonDioxideConcentration.AttributeDefs.measured_value.name, - config=(REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 0.000001), - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(PM25.cluster_id) -class PM25ClusterHandler(ClusterHandler): - """Particulate Matter 2.5 microns or less measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=PM25.AttributeDefs.measured_value.name, - config=(REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 0.1), - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(FormaldehydeConcentration.cluster_id) -class FormaldehydeConcentrationClusterHandler(ClusterHandler): - """Formaldehyde measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=FormaldehydeConcentration.AttributeDefs.measured_value.name, - config=(REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 0.000001), - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(ElectricalConductivity.cluster_id) -class ElectricalConductivityClusterHandler(ClusterHandler): - """Electrical Conductivity cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=ElectricalConductivity.AttributeDefs.measured_value.name, - config=REPORT_CONFIG_DEFAULT, - ), - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(WindSpeed.cluster_id) -class WindSpeedClusterHandler(ClusterHandler): - """Wind Speed measurement cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=WindSpeed.AttributeDefs.measured_value.name, - config=(REPORT_CONFIG_MIN_INT, REPORT_CONFIG_MAX_INT, 0.01), - ), - ) diff --git a/zha/zigbee/cluster_handlers/protocol.py b/zha/zigbee/cluster_handlers/protocol.py deleted file mode 100644 index fd312035b..000000000 --- a/zha/zigbee/cluster_handlers/protocol.py +++ /dev/null @@ -1,126 +0,0 @@ -"""Protocol cluster handlers module for Zigbee Home Automation.""" - -from zigpy.zcl.clusters.protocol import ( - AnalogInputExtended, - AnalogInputRegular, - AnalogOutputExtended, - AnalogOutputRegular, - AnalogValueExtended, - AnalogValueRegular, - BacnetProtocolTunnel, - BinaryInputExtended, - BinaryInputRegular, - BinaryOutputExtended, - BinaryOutputRegular, - BinaryValueExtended, - BinaryValueRegular, - GenericTunnel, - MultistateInputExtended, - MultistateInputRegular, - MultistateOutputExtended, - MultistateOutputRegular, - MultistateValueExtended, - MultistateValueRegular, -) - -from zha.zigbee.cluster_handlers import ClusterHandler, registries - - -@registries.CLUSTER_HANDLER_REGISTRY.register(AnalogInputExtended.cluster_id) -class AnalogInputExtendedClusterHandler(ClusterHandler): - """Analog Input Extended cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(AnalogInputRegular.cluster_id) -class AnalogInputRegularClusterHandler(ClusterHandler): - """Analog Input Regular cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(AnalogOutputExtended.cluster_id) -class AnalogOutputExtendedClusterHandler(ClusterHandler): - """Analog Output Regular cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(AnalogOutputRegular.cluster_id) -class AnalogOutputRegularClusterHandler(ClusterHandler): - """Analog Output Regular cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(AnalogValueExtended.cluster_id) -class AnalogValueExtendedClusterHandler(ClusterHandler): - """Analog Value Extended edition cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(AnalogValueRegular.cluster_id) -class AnalogValueRegularClusterHandler(ClusterHandler): - """Analog Value Regular cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(BacnetProtocolTunnel.cluster_id) -class BacnetProtocolTunnelClusterHandler(ClusterHandler): - """Bacnet Protocol Tunnel cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(BinaryInputExtended.cluster_id) -class BinaryInputExtendedClusterHandler(ClusterHandler): - """Binary Input Extended cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(BinaryInputRegular.cluster_id) -class BinaryInputRegularClusterHandler(ClusterHandler): - """Binary Input Regular cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(BinaryOutputExtended.cluster_id) -class BinaryOutputExtendedClusterHandler(ClusterHandler): - """Binary Output Extended cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(BinaryOutputRegular.cluster_id) -class BinaryOutputRegularClusterHandler(ClusterHandler): - """Binary Output Regular cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(BinaryValueExtended.cluster_id) -class BinaryValueExtendedClusterHandler(ClusterHandler): - """Binary Value Extended cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(BinaryValueRegular.cluster_id) -class BinaryValueRegularClusterHandler(ClusterHandler): - """Binary Value Regular cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(GenericTunnel.cluster_id) -class GenericTunnelClusterHandler(ClusterHandler): - """Generic Tunnel cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(MultistateInputExtended.cluster_id) -class MultiStateInputExtendedClusterHandler(ClusterHandler): - """Multistate Input Extended cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(MultistateInputRegular.cluster_id) -class MultiStateInputRegularClusterHandler(ClusterHandler): - """Multistate Input Regular cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(MultistateOutputExtended.cluster_id) -class MultiStateOutputExtendedClusterHandler(ClusterHandler): - """Multistate Output Extended cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(MultistateOutputRegular.cluster_id) -class MultiStateOutputRegularClusterHandler(ClusterHandler): - """Multistate Output Regular cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(MultistateValueExtended.cluster_id) -class MultiStateValueExtendedClusterHandler(ClusterHandler): - """Multistate Value Extended cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(MultistateValueRegular.cluster_id) -class MultiStateValueRegularClusterHandler(ClusterHandler): - """Multistate Value Regular cluster handler.""" diff --git a/zha/zigbee/cluster_handlers/registries.py b/zha/zigbee/cluster_handlers/registries.py deleted file mode 100644 index 07c8dc85e..000000000 --- a/zha/zigbee/cluster_handlers/registries.py +++ /dev/null @@ -1,13 +0,0 @@ -"""Mapping registries for zha cluster handlers.""" - -from zha.decorators import DictRegistry, NestedDictRegistry, SetRegistry -from zha.zigbee.cluster_handlers import ClientClusterHandler, ClusterHandler - -BINDABLE_CLUSTERS = SetRegistry() -CLUSTER_HANDLER_ONLY_CLUSTERS = SetRegistry() -CLIENT_CLUSTER_HANDLER_REGISTRY: DictRegistry[type[ClientClusterHandler]] = ( - DictRegistry() -) -CLUSTER_HANDLER_REGISTRY: NestedDictRegistry[type[ClusterHandler]] = ( - NestedDictRegistry() -) diff --git a/zha/zigbee/cluster_handlers/security.py b/zha/zigbee/cluster_handlers/security.py deleted file mode 100644 index 215da5fa2..000000000 --- a/zha/zigbee/cluster_handlers/security.py +++ /dev/null @@ -1,406 +0,0 @@ -"""Security cluster handlers module for Zigbee Home Automation.""" - -from __future__ import annotations - -from collections.abc import Callable -import dataclasses -from typing import TYPE_CHECKING, Any, Final - -import zigpy.zcl -from zigpy.zcl.clusters.security import ( - IasAce as AceCluster, - IasWd, - IasZone, - Squawk, - Strobe, - StrobeLevel, - WarningType, -) - -from zha.exceptions import ZHAException -from zha.zigbee.cluster_handlers import ( - ClientClusterHandler, - ClusterHandler, - ClusterHandlerStatus, - registries, -) -from zha.zigbee.cluster_handlers.const import CLUSTER_HANDLER_STATE_CHANGED - -if TYPE_CHECKING: - from zha.zigbee.endpoint import Endpoint - -SIGNAL_ARMED_STATE_CHANGED = "zha_armed_state_changed" -SIGNAL_ALARM_TRIGGERED = "zha_armed_triggered" - - -@dataclasses.dataclass(frozen=True, kw_only=True) -class ClusterHandlerStateChangedEvent: - """Event to signal that a cluster attribute has been updated.""" - - event_type: Final[str] = "cluster_handler_event" - event: Final[str] = "cluster_handler_state_changed" - - -@registries.CLIENT_CLUSTER_HANDLER_REGISTRY.register(AceCluster.cluster_id) -class IasAceClientClusterHandler(ClientClusterHandler): - """IAS Ancillary Control Equipment cluster handler.""" - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize IAS Ancillary Control Equipment cluster handler.""" - super().__init__(cluster, endpoint) - self.command_map: dict[int, Callable[..., Any]] = { - AceCluster.ServerCommandDefs.arm.id: self.arm, - AceCluster.ServerCommandDefs.bypass.id: self._bypass, - AceCluster.ServerCommandDefs.emergency.id: self._emergency, - AceCluster.ServerCommandDefs.fire.id: self._fire, - AceCluster.ServerCommandDefs.panic.id: self.panic, - AceCluster.ServerCommandDefs.get_zone_id_map.id: self._get_zone_id_map, - AceCluster.ServerCommandDefs.get_zone_info.id: self._get_zone_info, - AceCluster.ServerCommandDefs.get_panel_status.id: self._send_panel_status_response, - AceCluster.ServerCommandDefs.get_bypassed_zone_list.id: self._get_bypassed_zone_list, - AceCluster.ServerCommandDefs.get_zone_status.id: self._get_zone_status, - } - self.arm_map: dict[AceCluster.ArmMode, Callable[..., Any]] = { - AceCluster.ArmMode.Disarm: self._disarm, - AceCluster.ArmMode.Arm_All_Zones: self._arm_away, - AceCluster.ArmMode.Arm_Day_Home_Only: self._arm_day, - AceCluster.ArmMode.Arm_Night_Sleep_Only: self._arm_night, - } - self.armed_state: AceCluster.PanelStatus = AceCluster.PanelStatus.Panel_Disarmed - self.invalid_tries: int = 0 - - # These will all be setup by the entity from ZHA configuration - self.panel_code: str = "1234" - self.code_required_arm_actions = False - self.max_invalid_tries: int = 3 - - # where do we store this to handle restarts - self.alarm_status: AceCluster.AlarmStatus = AceCluster.AlarmStatus.No_Alarm - - def cluster_command(self, tsn, command_id, args) -> None: - """Handle commands received to this cluster.""" - self.debug( - "received command %s", self._cluster.server_commands[command_id].name - ) - self.command_map[command_id](*args) - - def arm(self, arm_mode: int, code: str | None, zone_id: int) -> None: - """Handle the IAS ACE arm command.""" - mode = AceCluster.ArmMode(arm_mode) - - self.emit_zha_event( - AceCluster.ServerCommandDefs.arm.name, - { - "arm_mode": mode.value, - "arm_mode_description": mode.name, - "code": code, - "zone_id": zone_id, - }, - ) - - zigbee_reply = self.arm_map[mode](code) - self._endpoint.device.gateway.async_create_task(zigbee_reply) - - if self.invalid_tries >= self.max_invalid_tries: - self.alarm_status = AceCluster.AlarmStatus.Emergency - self.armed_state = AceCluster.PanelStatus.In_Alarm - self.emit_zha_event(f"{self.unique_id}_{SIGNAL_ALARM_TRIGGERED}", []) - else: - self.emit_zha_event(f"{self.unique_id}_{SIGNAL_ARMED_STATE_CHANGED}", []) - self._emit_panel_status_changed() - - def _disarm(self, code: str): - """Test the code and disarm the panel if the code is correct.""" - if ( - code != self.panel_code - and self.armed_state != AceCluster.PanelStatus.Panel_Disarmed - ): - self.debug("Invalid code supplied to IAS ACE") - self.invalid_tries += 1 - zigbee_reply = self.arm_response( - AceCluster.ArmNotification.Invalid_Arm_Disarm_Code - ) - else: - self.invalid_tries = 0 - if ( - self.armed_state == AceCluster.PanelStatus.Panel_Disarmed - and self.alarm_status == AceCluster.AlarmStatus.No_Alarm - ): - self.debug("IAS ACE already disarmed") - zigbee_reply = self.arm_response( - AceCluster.ArmNotification.Already_Disarmed - ) - else: - self.debug("Disarming all IAS ACE zones") - zigbee_reply = self.arm_response( - AceCluster.ArmNotification.All_Zones_Disarmed - ) - - self.armed_state = AceCluster.PanelStatus.Panel_Disarmed - self.alarm_status = AceCluster.AlarmStatus.No_Alarm - return zigbee_reply - - def _arm_day(self, code: str) -> None: - """Arm the panel for day / home zones.""" - return self._handle_arm( - code, - AceCluster.PanelStatus.Armed_Stay, - AceCluster.ArmNotification.Only_Day_Home_Zones_Armed, - ) - - def _arm_night(self, code: str) -> None: - """Arm the panel for night / sleep zones.""" - return self._handle_arm( - code, - AceCluster.PanelStatus.Armed_Night, - AceCluster.ArmNotification.Only_Night_Sleep_Zones_Armed, - ) - - def _arm_away(self, code: str) -> None: - """Arm the panel for away mode.""" - return self._handle_arm( - code, - AceCluster.PanelStatus.Armed_Away, - AceCluster.ArmNotification.All_Zones_Armed, - ) - - def _handle_arm( - self, - code: str, - panel_status: AceCluster.PanelStatus, - armed_type: AceCluster.ArmNotification, - ) -> None: - """Arm the panel with the specified statuses.""" - if self.code_required_arm_actions and code != self.panel_code: - self.debug("Invalid code supplied to IAS ACE") - zigbee_reply = self.arm_response( - AceCluster.ArmNotification.Invalid_Arm_Disarm_Code - ) - else: - self.debug("Arming all IAS ACE zones") - self.armed_state = panel_status - zigbee_reply = self.arm_response(armed_type) - return zigbee_reply - - def _bypass(self, zone_list, code) -> None: - """Handle the IAS ACE bypass command.""" - self.emit_zha_event( - AceCluster.ServerCommandDefs.bypass.name, - {"zone_list": zone_list, "code": code}, - ) - - def _emergency(self) -> None: - """Handle the IAS ACE emergency command.""" - self._set_alarm(AceCluster.AlarmStatus.Emergency) - - def _fire(self) -> None: - """Handle the IAS ACE fire command.""" - self._set_alarm(AceCluster.AlarmStatus.Fire) - - def panic(self) -> None: - """Handle the IAS ACE panic command.""" - self._set_alarm(AceCluster.AlarmStatus.Emergency_Panic) - - def _set_alarm(self, status: AceCluster.AlarmStatus) -> None: - """Set the specified alarm status.""" - self.alarm_status = status - self.armed_state = AceCluster.PanelStatus.In_Alarm - self._emit_panel_status_changed() - - def _get_zone_id_map(self): - """Handle the IAS ACE zone id map command.""" - - def _get_zone_info(self, zone_id): - """Handle the IAS ACE zone info command.""" - - def _send_panel_status_response(self) -> None: - """Handle the IAS ACE panel status response command.""" - response = self.panel_status_response( - self.armed_state, - 0x00, - AceCluster.AudibleNotification.Default_Sound, - self.alarm_status, - ) - self._endpoint.device.gateway.async_create_task(response) - - def _emit_panel_status_changed(self) -> None: - """Handle the IAS ACE panel status changed command.""" - response = self.panel_status_changed( - self.armed_state, - 0x00, - AceCluster.AudibleNotification.Default_Sound, - self.alarm_status, - ) - self._endpoint.device.gateway.async_create_task(response) - self.emit( - CLUSTER_HANDLER_STATE_CHANGED, - ClusterHandlerStateChangedEvent(), - ) - - def _get_bypassed_zone_list(self): - """Handle the IAS ACE bypassed zone list command.""" - - def _get_zone_status( - self, starting_zone_id, max_zone_ids, zone_status_mask_flag, zone_status_mask - ): - """Handle the IAS ACE zone status command.""" - - -@registries.CLUSTER_HANDLER_ONLY_CLUSTERS.register(IasWd.cluster_id) -@registries.CLUSTER_HANDLER_REGISTRY.register(IasWd.cluster_id) -class IasWdClusterHandler(ClusterHandler): - """IAS Warning Device cluster handler.""" - - @staticmethod - def set_bit(destination_value, destination_bit, source_value, source_bit): - """Set the specified bit in the value.""" - - if IasWdClusterHandler.get_bit(source_value, source_bit): - return destination_value | (1 << destination_bit) - return destination_value - - @staticmethod - def get_bit(value, bit): - """Get the specified bit from the value.""" - return (value & (1 << bit)) != 0 - - async def issue_squawk( - self, - mode=Squawk.SquawkMode.Armed, - strobe=Strobe.Strobe, - squawk_level=Squawk.SquawkLevel.High_level_sound, - ): - """Issue a squawk command. - - This command uses the WD capabilities to emit a quick audible/visible - pulse called a "squawk". The squawk command has no effect if the WD - is currently active (warning in progress). - """ - value = 0 - value = IasWdClusterHandler.set_bit(value, 0, squawk_level, 0) - value = IasWdClusterHandler.set_bit(value, 1, squawk_level, 1) - - value = IasWdClusterHandler.set_bit(value, 3, strobe, 0) - - value = IasWdClusterHandler.set_bit(value, 4, mode, 0) - value = IasWdClusterHandler.set_bit(value, 5, mode, 1) - value = IasWdClusterHandler.set_bit(value, 6, mode, 2) - value = IasWdClusterHandler.set_bit(value, 7, mode, 3) - - await self.squawk(value) - - async def issue_start_warning( - self, - mode=WarningType.WarningMode.Emergency, - strobe=Strobe.Strobe, - siren_level=WarningType.SirenLevel.High_level_sound, - warning_duration=5, # seconds - strobe_duty_cycle=0x00, - strobe_intensity=StrobeLevel.High_level_strobe, - ): - """Issue a start warning command. - - This command starts the WD operation. The WD alerts the surrounding area - by audible (siren) and visual (strobe) signals. - - strobe_duty_cycle indicates the length of the flash cycle. This provides a means - of varying the flash duration for different alarm types (e.g., fire, police, - burglar). Valid range is 0-100 in increments of 10. All other values SHALL - be rounded to the nearest valid value. Strobe SHALL calculate duty cycle over - a duration of one second. - - The ON state SHALL precede the OFF state. For example, if Strobe Duty Cycle - Field specifies “40,” then the strobe SHALL flash ON for 4/10ths of a second - and then turn OFF for 6/10ths of a second. - """ - value = 0 - value = IasWdClusterHandler.set_bit(value, 0, siren_level, 0) - value = IasWdClusterHandler.set_bit(value, 1, siren_level, 1) - - value = IasWdClusterHandler.set_bit(value, 2, strobe, 0) - - value = IasWdClusterHandler.set_bit(value, 4, mode, 0) - value = IasWdClusterHandler.set_bit(value, 5, mode, 1) - value = IasWdClusterHandler.set_bit(value, 6, mode, 2) - value = IasWdClusterHandler.set_bit(value, 7, mode, 3) - - await self.start_warning( - value, warning_duration, strobe_duty_cycle, strobe_intensity - ) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(IasZone.cluster_id) -class IASZoneClusterHandler(ClusterHandler): - """Cluster handler for the IASZone Zigbee cluster.""" - - _value_attribute: str = IasZone.AttributeDefs.zone_status.name - - ZCL_INIT_ATTRS = { - IasZone.AttributeDefs.zone_status.name: False, - IasZone.AttributeDefs.zone_state.name: True, - IasZone.AttributeDefs.zone_type.name: True, - } - - def cluster_command(self, tsn, command_id, args): - """Handle commands received to this cluster.""" - if command_id == IasZone.ClientCommandDefs.status_change_notification.id: - zone_status = args[0] - # update attribute cache with new zone status - self.cluster.update_attribute( - IasZone.AttributeDefs.zone_status.id, zone_status - ) - self.debug("Updated alarm state: %s", zone_status) - elif command_id == IasZone.ClientCommandDefs.enroll.id: - self.debug("Enroll requested") - self._cluster.create_catching_task( - self.enroll_response( - enroll_response_code=IasZone.EnrollResponse.Success, zone_id=0 - ) - ) - - async def async_configure(self): - """Configure IAS device.""" - await self.get_attribute_value( - IasZone.AttributeDefs.zone_type.name, from_cache=False - ) - if self._endpoint.device.skip_configuration: - self.debug("skipping IASZoneClusterHandler configuration") - return - - self.debug("started IASZoneClusterHandler configuration") - - await self.bind() - ieee = self.cluster.endpoint.device.application.state.node_info.ieee - - try: - await self.write_attributes_safe( - {IasZone.AttributeDefs.cie_addr.name: ieee} - ) - self.debug( - "wrote cie_addr: %s to '%s' cluster", - str(ieee), - self._cluster.ep_attribute, - ) - except ZHAException as ex: - self.debug( - "Failed to write cie_addr: %s to '%s' cluster: %s", - str(ieee), - self._cluster.ep_attribute, - str(ex), - ) - - self.debug("Sending pro-active IAS enroll response") - self._cluster.create_catching_task( - self.enroll_response( - enroll_response_code=IasZone.EnrollResponse.Success, zone_id=0 - ) - ) - - self._status = ClusterHandlerStatus.CONFIGURED - self.debug("finished IASZoneClusterHandler configuration") - - async def async_update(self) -> None: - """Retrieve latest state.""" - await self.get_attribute_value( - IasZone.AttributeDefs.zone_status.name, from_cache=False - ) diff --git a/zha/zigbee/cluster_handlers/smartenergy.py b/zha/zigbee/cluster_handlers/smartenergy.py deleted file mode 100644 index b091da428..000000000 --- a/zha/zigbee/cluster_handlers/smartenergy.py +++ /dev/null @@ -1,334 +0,0 @@ -"""Smart energy cluster handlers module for Zigbee Home Automation.""" - -from __future__ import annotations - -import enum -from typing import TYPE_CHECKING - -import zigpy.zcl -from zigpy.zcl.clusters.smartenergy import ( - Calendar, - DeviceManagement, - Drlc, - EnergyManagement, - Events, - KeyEstablishment, - MduPairing, - Messaging, - Metering, - Prepayment, - Price, - Tunneling, -) - -from zha.zigbee.cluster_handlers import AttrReportConfig, ClusterHandler, registries -from zha.zigbee.cluster_handlers.const import ( - REPORT_CONFIG_ASAP, - REPORT_CONFIG_DEFAULT, - REPORT_CONFIG_OP, -) - -if TYPE_CHECKING: - from zha.zigbee.endpoint import Endpoint - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Calendar.cluster_id) -class CalendarClusterHandler(ClusterHandler): - """Calendar cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(DeviceManagement.cluster_id) -class DeviceManagementClusterHandler(ClusterHandler): - """Device Management cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Drlc.cluster_id) -class DrlcClusterHandler(ClusterHandler): - """Demand Response and Load Control cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(EnergyManagement.cluster_id) -class EnergyManagementClusterHandler(ClusterHandler): - """Energy Management cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Events.cluster_id) -class EventsClusterHandler(ClusterHandler): - """Event cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(KeyEstablishment.cluster_id) -class KeyEstablishmentClusterHandler(ClusterHandler): - """Key Establishment cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(MduPairing.cluster_id) -class MduPairingClusterHandler(ClusterHandler): - """Pairing cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Messaging.cluster_id) -class MessagingClusterHandler(ClusterHandler): - """Messaging cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Metering.cluster_id) -class MeteringClusterHandler(ClusterHandler): - """Metering cluster handler.""" - - REPORT_CONFIG = ( - AttrReportConfig( - attr=Metering.AttributeDefs.instantaneous_demand.name, - config=REPORT_CONFIG_OP, - ), - AttrReportConfig( - attr=Metering.AttributeDefs.current_summ_delivered.name, - config=REPORT_CONFIG_DEFAULT, - ), - AttrReportConfig( - attr=Metering.AttributeDefs.current_tier1_summ_delivered.name, - config=REPORT_CONFIG_DEFAULT, - ), - AttrReportConfig( - attr=Metering.AttributeDefs.current_tier2_summ_delivered.name, - config=REPORT_CONFIG_DEFAULT, - ), - AttrReportConfig( - attr=Metering.AttributeDefs.current_tier3_summ_delivered.name, - config=REPORT_CONFIG_DEFAULT, - ), - AttrReportConfig( - attr=Metering.AttributeDefs.current_tier4_summ_delivered.name, - config=REPORT_CONFIG_DEFAULT, - ), - AttrReportConfig( - attr=Metering.AttributeDefs.current_tier5_summ_delivered.name, - config=REPORT_CONFIG_DEFAULT, - ), - AttrReportConfig( - attr=Metering.AttributeDefs.current_tier6_summ_delivered.name, - config=REPORT_CONFIG_DEFAULT, - ), - AttrReportConfig( - attr=Metering.AttributeDefs.current_summ_received.name, - config=REPORT_CONFIG_DEFAULT, - ), - AttrReportConfig( - attr=Metering.AttributeDefs.status.name, - config=REPORT_CONFIG_ASAP, - ), - ) - ZCL_INIT_ATTRS = { - Metering.AttributeDefs.demand_formatting.name: True, - Metering.AttributeDefs.divisor.name: True, - Metering.AttributeDefs.metering_device_type.name: True, - Metering.AttributeDefs.multiplier.name: True, - Metering.AttributeDefs.summation_formatting.name: True, - Metering.AttributeDefs.unit_of_measure.name: True, - } - - METERING_DEVICE_TYPES_ELECTRIC = { - 0, - 7, - 8, - 9, - 10, - 11, - 13, - 14, - 15, - 127, - 134, - 135, - 136, - 137, - 138, - 140, - 141, - 142, - } - METERING_DEVICE_TYPES_GAS = {1, 128} - METERING_DEVICE_TYPES_WATER = {2, 129} - METERING_DEVICE_TYPES_HEATING_COOLING = {3, 5, 6, 130, 132, 133} - - metering_device_type = { - 0: "Electric Metering", - 1: "Gas Metering", - 2: "Water Metering", - 3: "Thermal Metering", # deprecated - 4: "Pressure Metering", - 5: "Heat Metering", - 6: "Cooling Metering", - 7: "End Use Measurement Device (EUMD) for metering electric vehicle charging", - 8: "PV Generation Metering", - 9: "Wind Turbine Generation Metering", - 10: "Water Turbine Generation Metering", - 11: "Micro Generation Metering", - 12: "Solar Hot Water Generation Metering", - 13: "Electric Metering Element/Phase 1", - 14: "Electric Metering Element/Phase 2", - 15: "Electric Metering Element/Phase 3", - 127: "Mirrored Electric Metering", - 128: "Mirrored Gas Metering", - 129: "Mirrored Water Metering", - 130: "Mirrored Thermal Metering", # deprecated - 131: "Mirrored Pressure Metering", - 132: "Mirrored Heat Metering", - 133: "Mirrored Cooling Metering", - 134: "Mirrored End Use Measurement Device (EUMD) for metering electric vehicle charging", - 135: "Mirrored PV Generation Metering", - 136: "Mirrored Wind Turbine Generation Metering", - 137: "Mirrored Water Turbine Generation Metering", - 138: "Mirrored Micro Generation Metering", - 139: "Mirrored Solar Hot Water Generation Metering", - 140: "Mirrored Electric Metering Element/Phase 1", - 141: "Mirrored Electric Metering Element/Phase 2", - 142: "Mirrored Electric Metering Element/Phase 3", - } - - class DeviceStatusElectric(enum.IntFlag): - """Electric Metering Device Status.""" - - NO_ALARMS = 0 - CHECK_METER = 1 - LOW_BATTERY = 2 - TAMPER_DETECT = 4 - POWER_FAILURE = 8 - POWER_QUALITY = 16 - LEAK_DETECT = 32 # Really? - SERVICE_DISCONNECT = 64 - RESERVED = 128 - - class DeviceStatusGas(enum.IntFlag): - """Gas Metering Device Status.""" - - NO_ALARMS = 0 - CHECK_METER = 1 - LOW_BATTERY = 2 - TAMPER_DETECT = 4 - NOT_DEFINED = 8 - LOW_PRESSURE = 16 - LEAK_DETECT = 32 - SERVICE_DISCONNECT = 64 - REVERSE_FLOW = 128 - - class DeviceStatusWater(enum.IntFlag): - """Water Metering Device Status.""" - - NO_ALARMS = 0 - CHECK_METER = 1 - LOW_BATTERY = 2 - TAMPER_DETECT = 4 - PIPE_EMPTY = 8 - LOW_PRESSURE = 16 - LEAK_DETECT = 32 - SERVICE_DISCONNECT = 64 - REVERSE_FLOW = 128 - - class DeviceStatusHeatingCooling(enum.IntFlag): - """Heating and Cooling Metering Device Status.""" - - NO_ALARMS = 0 - CHECK_METER = 1 - LOW_BATTERY = 2 - TAMPER_DETECT = 4 - TEMPERATURE_SENSOR = 8 - BURST_DETECT = 16 - LEAK_DETECT = 32 - SERVICE_DISCONNECT = 64 - REVERSE_FLOW = 128 - - class DeviceStatusDefault(enum.IntFlag): - """Metering Device Status.""" - - NO_ALARMS = 0 - - class FormatSelector(enum.IntEnum): - """Format specified selector.""" - - DEMAND = 0 - SUMMATION = 1 - - def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: - """Initialize Metering.""" - super().__init__(cluster, endpoint) - self._format_spec: str | None = None - self._summa_format: str | None = None - - @property - def divisor(self) -> int: - """Return divisor for the value.""" - return self.cluster.get(Metering.AttributeDefs.divisor.name) or 1 - - @property - def device_type(self) -> str | int | None: - """Return metering device type.""" - dev_type = self.cluster.get(Metering.AttributeDefs.metering_device_type.name) - if dev_type is None: - return None - return self.metering_device_type.get(dev_type, dev_type) - - @property - def multiplier(self) -> int: - """Return multiplier for the value.""" - return self.cluster.get(Metering.AttributeDefs.multiplier.name) or 1 - - @property - def metering_status(self) -> int | None: - """Return metering device status.""" - if (status := self.cluster.get(Metering.AttributeDefs.status.name)) is None: - return None - - metering_device_type = self.cluster.get( - Metering.AttributeDefs.metering_device_type.name - ) - if metering_device_type in self.METERING_DEVICE_TYPES_ELECTRIC: - return self.DeviceStatusElectric(status) - if metering_device_type in self.METERING_DEVICE_TYPES_GAS: - return self.DeviceStatusGas(status) - if metering_device_type in self.METERING_DEVICE_TYPES_WATER: - return self.DeviceStatusWater(status) - if metering_device_type in self.METERING_DEVICE_TYPES_HEATING_COOLING: - return self.DeviceStatusHeatingCooling(status) - return self.DeviceStatusDefault(status) - - @property - def unit_of_measurement(self) -> int: - """Return unit of measurement.""" - return self.cluster.get(Metering.AttributeDefs.unit_of_measure.name) - - @property - def demand_formatting(self) -> int | None: - """Return demand formatting.""" - return self.cluster.get(Metering.AttributeDefs.demand_formatting.name) - - @property - def summation_formatting(self) -> int | None: - """Return summation formatting.""" - return self.cluster.get(Metering.AttributeDefs.summation_formatting.name) - - async def async_update(self) -> None: - """Retrieve latest state.""" - self.debug("async_update") - - attrs = [ - a["attr"] - for a in self.REPORT_CONFIG - if not self.cluster.is_attribute_unsupported(a["attr"]) - ] - await self.get_attributes(attrs, from_cache=False, only_cache=False) - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Prepayment.cluster_id) -class PrepaymentClusterHandler(ClusterHandler): - """Prepayment cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Price.cluster_id) -class PriceClusterHandler(ClusterHandler): - """Price cluster handler.""" - - -@registries.CLUSTER_HANDLER_REGISTRY.register(Tunneling.cluster_id) -class TunnelingClusterHandler(ClusterHandler): - """Tunneling cluster handler.""" diff --git a/zha/zigbee/device.py b/zha/zigbee/device.py index 14884e1da..208f05d11 100644 --- a/zha/zigbee/device.py +++ b/zha/zigbee/device.py @@ -25,8 +25,9 @@ from zigpy.types import uint1_t, uint8_t, uint16_t from zigpy.types.named import EUI64, NWK, ExtendedPanId from zigpy.typing import UNDEFINED, UndefinedType +import zigpy.zcl from zigpy.zcl.clusters import Cluster -from zigpy.zcl.clusters.general import Groups, Identify, Ota +from zigpy.zcl.clusters.general import Basic, Groups, Identify, Ota from zigpy.zcl.foundation import ( Status as ZclStatus, WriteAttributesResponse, @@ -67,14 +68,15 @@ UNKNOWN, UNKNOWN_MANUFACTURER, UNKNOWN_MODEL, - ZHA_CLUSTER_HANDLER_CFG_DONE, - ZHA_CLUSTER_HANDLER_MSG, + ZHA_CLUSTER_BIND_EVENT, + ZHA_CLUSTER_CONFIGURE_REPORTING_EVENT, + ZHA_DEVICE_CONFIGURED_EVENT, ZHA_DEVICE_ENTITY_ADDED_EVENT, ZHA_DEVICE_ENTITY_REMOVED_EVENT, ZHA_DEVICE_UPDATED_EVENT, ZHA_EVENT, ) -from zha.application.helpers import convert_to_zcl_values, convert_zcl_value +from zha.application.helpers import convert_to_zcl_values, convert_zcl_value, safe_read from zha.application.platforms import ( BaseEntity, BaseEntityInfo, @@ -86,7 +88,11 @@ from zha.event import EventBase from zha.exceptions import ZHAException from zha.mixins import LogMixin -from zha.zigbee.cluster_handlers import ClusterHandler, ZDOClusterHandler +from zha.zigbee.cluster_config import ( + aggregate_cluster_configs, + configure_cluster_configs, + initialize_cluster_configs, +) from zha.zigbee.endpoint import Endpoint if TYPE_CHECKING: @@ -94,7 +100,45 @@ _LOGGER = logging.getLogger(__name__) _CHECKIN_GRACE_PERIODS = 2 -DIAGNOSTICS_JSON_VERSION = 1 +DIAGNOSTICS_JSON_VERSION = 2 + + +def _entity_targets_cluster( + entity: PlatformEntity, + cluster_id: int, + cluster_type: zigpy.zcl.ClusterType | None = None, +) -> bool: + """Return True if `entity` targets the given cluster (and direction).""" + match = entity._cluster_match + if match is None: + # Generated quirks-v2 entities have no class-level `_cluster_match` but + # do have a concrete backing cluster; match against it directly. + cluster = entity.cluster + if cluster.cluster_id != cluster_id: + return False + if cluster_type is None: + return True + actual_type = ( + zigpy.zcl.ClusterType.Client + if cluster.is_client + else zigpy.zcl.ClusterType.Server + ) + return cluster_type == actual_type + + if cluster_type is None or cluster_type == zigpy.zcl.ClusterType.Server: + if ( + cluster_id in match.server_clusters + or cluster_id in match.optional_server_clusters + ): + return True + if cluster_type is not None: + return False + if (cluster_type is None or cluster_type == zigpy.zcl.ClusterType.Client) and ( + cluster_id in match.client_clusters + or cluster_id in match.optional_client_clusters + ): + return True + return False def get_cluster_attr_data(cluster: Cluster) -> list[dict]: @@ -127,6 +171,15 @@ def get_cluster_attr_data(cluster: Cluster) -> list[dict]: return attributes_info +def _cluster_entry(cluster_id: int, cluster: Cluster) -> dict[str, Any]: + """Build the per-cluster diagnostics entry.""" + return { + "cluster_id": f"0x{cluster_id:04x}", + "endpoint_attribute": cluster.ep_attribute, + "attributes": get_cluster_attr_data(cluster), + } + + def get_device_automation_triggers( device: zigpy.device.Device, ) -> dict[tuple[str, str], dict[str, str]]: @@ -201,13 +254,46 @@ class DeviceEntityRemovedEvent: @dataclass(kw_only=True, frozen=True) -class ClusterHandlerConfigurationComplete: - """Event generated when all cluster handlers are configured.""" +class DeviceConfiguredEvent: + """Emitted when `device.async_configure()` completes.""" + + event_type: Final[str] = ZHA_DEVICE_CONFIGURED_EVENT + event: Final[str] = ZHA_DEVICE_CONFIGURED_EVENT device_ieee: EUI64 - unique_id: str - event_type: Final[str] = ZHA_CLUSTER_HANDLER_MSG - event: Final[str] = ZHA_CLUSTER_HANDLER_CFG_DONE + + +@dataclass(kw_only=True, frozen=True) +class ClusterBindEvent: + """Emitted after attempting to bind a cluster to the coordinator.""" + + event_type: Final[str] = ZHA_CLUSTER_BIND_EVENT + event: Final[str] = ZHA_CLUSTER_BIND_EVENT + + device_ieee: EUI64 + endpoint_id: int + cluster_id: int + cluster_name: str + success: bool + + +@dataclass(kw_only=True, frozen=True) +class ClusterConfigureReportingEvent: + """Emitted after configuring attribute reporting on a cluster. + + ``attributes`` is keyed by attribute name; each value is + ``{"id", "name", "min", "max", "change", "status"}`` where ``status`` is + the per-attribute ZCL status name or ``"FAILURE"`` on transport error. + """ + + event_type: Final[str] = ZHA_CLUSTER_CONFIGURE_REPORTING_EVENT + event: Final[str] = ZHA_CLUSTER_CONFIGURE_REPORTING_EVENT + + device_ieee: EUI64 + endpoint_id: int + cluster_id: int + cluster_name: str + attributes: dict[str, dict[str, Any]] @dataclass(kw_only=True, frozen=True) @@ -314,6 +400,11 @@ def __init__( self._platform_entities: dict[tuple[Platform, str], PlatformEntity] = {} self._pending_entities: list[PlatformEntity] = [] + # All entities discovered for this device, including ones removed by a quirk. + # Used for aggregating cluster configs so binding/reporting matches the + # legacy claim-during-discovery flow (which configured handlers even when + # the visible entity was filtered out later). + self._discovered_entities: list[PlatformEntity] = [] self._initialized: bool = False self.semaphore: asyncio.Semaphore = asyncio.Semaphore(3) self._on_remove_callbacks: list[Callable[[], None]] = [] @@ -339,6 +430,7 @@ def _init_from_zigpy_device(self, zigpy_device: zigpy.device.Device) -> None: self._on_remove_callbacks.clear() self._endpoints.clear() self._pending_entities.clear() + self._discovered_entities.clear() self._zigpy_device: ZigpyDevice = zigpy_device @@ -366,9 +458,6 @@ def _init_from_zigpy_device(self, zigpy_device: zigpy.device.Device) -> None: f.feature for f in self.quirk_metadata.exposes_features ) - self._power_config_ch: ClusterHandler | None = None - self._identify_ch: ClusterHandler | None = None - self._basic_ch: ClusterHandler | None = None self._firmware_version: str | None = None device_options = self._gateway.config.config.device_options @@ -385,10 +474,6 @@ def _init_from_zigpy_device(self, zigpy_device: zigpy.device.Device) -> None: self.status: DeviceStatus = DeviceStatus.CREATED - self._zdo_handler: ZDOClusterHandler = ZDOClusterHandler(self) - self._zdo_handler.on_add() - self._on_remove_callbacks.append(self._zdo_handler.on_remove) - for ep_id, endpoint in zigpy_device.endpoints.items(): if ep_id != 0: ep = Endpoint.new(endpoint, self) @@ -614,43 +699,25 @@ def on_network(self, new_on_network: bool) -> None: if not new_on_network: self.debug("Device is not on the network, marking unavailable") - @property - def power_configuration_ch(self) -> ClusterHandler | None: - """Return power configuration cluster handler.""" - return self._power_config_ch - - @power_configuration_ch.setter - def power_configuration_ch(self, cluster_handler: ClusterHandler) -> None: - """Power configuration cluster handler setter.""" - if self._power_config_ch is None: - self._power_config_ch = cluster_handler - - @property - def basic_ch(self) -> ClusterHandler | None: - """Return basic cluster handler.""" - return self._basic_ch - - @basic_ch.setter - def basic_ch(self, cluster_handler: ClusterHandler) -> None: - """Set the basic cluster handler.""" - if self._basic_ch is None: - self._basic_ch = cluster_handler + def _first_in_cluster(self, cluster_id: int) -> zigpy.zcl.Cluster | None: + """Return the first in_cluster with the given cluster_id across endpoints.""" + for ep_id, ep in self._zigpy_device.endpoints.items(): + if ep_id == 0: + continue + cluster = ep.in_clusters.get(cluster_id) + if cluster is not None: + return cluster + return None @property - def identify_ch(self) -> ClusterHandler | None: - """Return power configuration cluster handler.""" - return self._identify_ch - - @identify_ch.setter - def identify_ch(self, cluster_handler: ClusterHandler) -> None: - """Power configuration cluster handler setter.""" - if self._identify_ch is None: - self._identify_ch = cluster_handler + def basic_cluster(self) -> zigpy.zcl.Cluster | None: + """Return the first Basic cluster across endpoints, if present.""" + return self._first_in_cluster(Basic.cluster_id) @property - def zdo_cluster_handler(self) -> ZDOClusterHandler: - """Return ZDO cluster handler.""" - return self._zdo_handler + def identify_cluster(self) -> zigpy.zcl.Cluster | None: + """Return the first Identify cluster across endpoints, if present.""" + return self._first_in_cluster(Identify.cluster_id) @property def endpoints(self) -> dict[int, Endpoint]: @@ -689,6 +756,36 @@ def get_platform_entity(self, platform: Platform, unique_id: str) -> PlatformEnt raise KeyError(f"Entity {unique_id} not found") return entity + def get_entity( + self, + platform: Platform, + endpoint_id: int | None = None, + cluster_id: int | None = None, + *, + pick_first: bool = False, + ) -> PlatformEntity: + """Look up the unique entity matching platform/endpoint/cluster filters. + + With pick_first=True, returns the first match instead of raising on multiple + matches. Always raises if there are zero matches. + """ + matches = [] + for entity in self._platform_entities.values(): + if platform != entity.PLATFORM: + continue + if endpoint_id is not None and entity.endpoint.id != endpoint_id: + continue + if cluster_id is not None and entity.cluster.cluster_id != cluster_id: + continue + matches.append(entity) + if not matches or (not pick_first and len(matches) != 1): + raise LookupError( + f"Expected {'>=1' if pick_first else '1'} entity matching " + f"platform={platform!r}, endpoint_id={endpoint_id}, " + f"cluster_id={cluster_id}; found {len(matches)}" + ) + return matches[0] + @classmethod def new( cls, @@ -753,14 +850,15 @@ async def _check_available(self, *_: Any) -> None: "Attempting to checkin with device - missed checkins: %s", self._checkins_missed_count, ) - if not self.basic_ch: + basic = self.basic_cluster + if basic is None: self.debug("does not have a mandatory basic cluster") self.update_available(False) return - res = await self.basic_ch.get_attribute_value( - ATTR_MANUFACTURER, from_cache=False + res = await safe_read( + basic, [ATTR_MANUFACTURER], allow_cache=False, only_cache=False ) - if res is not None: + if res.get(ATTR_MANUFACTURER) is not None: self._checkins_missed_count = 0 def update_available(self, available: bool) -> None: @@ -900,31 +998,30 @@ def extended_device_info(self) -> ExtendedDeviceInfo: async def async_configure(self) -> None: """Configure the device.""" self.debug("started configuration") - await self._zdo_handler.async_configure() - self._zdo_handler.debug("'async_configure' stage succeeded") if isinstance(self._zigpy_device, zigpy.quirks.BaseCustomDevice): self.debug("applying quirks custom device configuration") await self._zigpy_device.apply_custom_configuration() - # Try to add entities to claim the cluster handlers self._discover_new_entities() - await asyncio.gather( - *(endpoint.async_configure() for endpoint in self._endpoints.values()) - ) + # Configure binding and reporting from entity-level cluster configs + aggregated = aggregate_cluster_configs(self._discovered_entities) + if aggregated and not self.skip_configuration: + await configure_cluster_configs(self, aggregated) self.emit_reconfigure_done() self.debug("completed configuration") + identify_cluster = self.identify_cluster if ( self.gateway.config.config.device_options.enable_identify_on_join - and self.identify_ch is not None + and identify_cluster is not None and not self.skip_configuration ): self._gateway.async_create_task( - self.identify_ch.trigger_effect( + identify_cluster.trigger_effect( effect_id=Identify.EffectIdentifier.Okay, effect_variant=Identify.EffectVariant.Default, ), @@ -945,24 +1042,23 @@ async def async_rebuild_from_zigpy_device( self._init_from_zigpy_device(zigpy_device) def emit_reconfigure_done(self) -> None: - """Emit configuration-complete event. + """Emit `DeviceConfiguredEvent`. - Called by the gateway after a reconfigure (successful or not) so that - frontends listening for cluster handler messages know the operation - has finished. + Called by the gateway after a reconfigure (successful or not) so the + HA frontend's reconfigure dialog unsticks. """ self.emit( - ZHA_CLUSTER_HANDLER_CFG_DONE, - ClusterHandlerConfigurationComplete( - device_ieee=self.ieee, - unique_id=self.ieee, - ), + ZHA_DEVICE_CONFIGURED_EVENT, + DeviceConfiguredEvent(device_ieee=self.ieee), ) def _is_entity_removed_by_quirk(self, entity: PlatformEntity) -> bool: if self.quirk_metadata is None: return False + if entity.PLATFORM == Platform.VIRTUAL: + return False + for meta in self.quirk_metadata.disabled_default_entities: _LOGGER.debug("Checking if entity %s is removed by %s", entity, meta) @@ -974,9 +1070,8 @@ def _is_entity_removed_by_quirk(self, entity: PlatformEntity) -> bool: if meta.endpoint_id is not None and entity.endpoint.id != meta.endpoint_id: continue - if meta.cluster_id is not None and not any( - cluster_handler.cluster.cluster_id == meta.cluster_id - for cluster_handler in entity.cluster_handlers.values() + if meta.cluster_id is not None and not _entity_targets_cluster( + entity, meta.cluster_id ): continue @@ -992,6 +1087,9 @@ def _apply_entity_metadata_changes(self, entity: PlatformEntity) -> None: if self.quirk_metadata is None: return + if entity.PLATFORM == Platform.VIRTUAL: + return + for meta in self.quirk_metadata.changed_entity_metadata: if meta.unique_id_suffix is not None and not entity.unique_id.endswith( meta.unique_id_suffix @@ -1001,10 +1099,8 @@ def _apply_entity_metadata_changes(self, entity: PlatformEntity) -> None: if meta.endpoint_id is not None and entity.endpoint.id != meta.endpoint_id: continue - if meta.cluster_id is not None and not any( - cluster_handler.cluster.cluster_id == meta.cluster_id - and cluster_handler.cluster.cluster_type == meta.cluster_type - for cluster_handler in entity.cluster_handlers.values() + if meta.cluster_id is not None and not _entity_targets_cluster( + entity, meta.cluster_id, cluster_type=meta.cluster_type ): continue @@ -1050,6 +1146,8 @@ def _apply_entity_metadata_changes(self, entity: PlatformEntity) -> None: def _discover_new_entities(self) -> None: new_entities: Iterable[BaseEntity] + self._discovered_entities.clear() + if self.is_active_coordinator: new_entities = discovery.discover_coordinator_device_entities(self) elif self.is_coordinator: @@ -1060,6 +1158,7 @@ def _discover_new_entities(self) -> None: # Discover all applicable entities for entity in new_entities: + self._discovered_entities.append(entity) if self._is_entity_removed_by_quirk(entity): continue @@ -1182,18 +1281,10 @@ async def async_initialize(self, from_cache: bool = False) -> None: # We discover prospective entities before initialization self._discover_new_entities() - await self._zdo_handler.async_initialize(from_cache) - self._zdo_handler.debug("'async_initialize' stage succeeded") - - # We intentionally do not use `gather` here! This is so that if, for example, - # three `device.async_initialize()`s are spawned, only three concurrent requests - # will ever be in flight at once. Startup concurrency is managed at the device - # level. - for endpoint in self._endpoints.values(): - try: - await endpoint.async_initialize(from_cache) - except Exception: # pylint: disable=broad-exception-caught - self.debug("Failed to initialize endpoint", exc_info=True) + # Read initial attributes from entity-level cluster configs + aggregated = aggregate_cluster_configs(self._discovered_entities) + if aggregated and not self.skip_configuration: + await initialize_cluster_configs(aggregated, from_cache) # And add them after. Emit events only on re-initialization, not the first. await self._add_pending_entities(emit_event=self._initialized) @@ -1689,18 +1780,12 @@ def get_diagnostics_json(self): "id": endpoint.device_type, }, "in_clusters": [ - { - "cluster_id": f"0x{cluster_id:04x}", - "endpoint_attribute": cluster.ep_attribute, - "attributes": get_cluster_attr_data(cluster), - } + _cluster_entry(cluster_id, cluster) for cluster_id, cluster in sorted(endpoint.in_clusters.items()) ], "out_clusters": [ { - "cluster_id": f"0x{cluster_id:04x}", - "endpoint_attribute": cluster.ep_attribute, - "attributes": get_cluster_attr_data(cluster), + **_cluster_entry(cluster_id, cluster), **( { "last_query_cmd": { @@ -1750,17 +1835,13 @@ def get_diagnostics_json(self): for (platform, _unique_id), platform_entity in sorted( self.platform_entities.items() ): + if platform is Platform.VIRTUAL: + continue + info_object = dataclasses.asdict(platform_entity.info_object) - info_object["cluster_handlers"].sort(key=lambda i: i["unique_id"]) info_object["migrate_unique_ids"] = list(info_object["migrate_unique_ids"]) info_object["device_ieee"] = str(info_object["device_ieee"]) - for cluster_handler_info in info_object["cluster_handlers"]: - cluster_info = cluster_handler_info["cluster"] - - if cluster_info is not None: - cluster_info.pop("commands", None) - obj: dict[str, Any] = { "info_object": info_object, "state": platform_entity.state, diff --git a/zha/zigbee/endpoint.py b/zha/zigbee/endpoint.py index 750e37505..5bc868421 100644 --- a/zha/zigbee/endpoint.py +++ b/zha/zigbee/endpoint.py @@ -2,32 +2,20 @@ from __future__ import annotations -import asyncio -from collections.abc import Awaitable, Callable import functools import logging -from typing import TYPE_CHECKING, Any, Final, TypeVar +from typing import TYPE_CHECKING, Any, Final from zigpy.profiles.zha import PROFILE_ID as ZHA_PROFILE_ID from zigpy.profiles.zll import PROFILE_ID as ZLL_PROFILE_ID +import zigpy.zcl +from zigpy.zcl.foundation import CommandSchema from zha.application import const -from zha.async_ import gather_with_limited_concurrency -from zha.zigbee.cluster_handlers import ClusterHandler -from zha.zigbee.cluster_handlers.const import ( - CLUSTER_HANDLER_BASIC, - CLUSTER_HANDLER_IDENTIFY, - CLUSTER_HANDLER_POWER_CONFIGURATION, -) -from zha.zigbee.cluster_handlers.registries import ( - CLIENT_CLUSTER_HANDLER_REGISTRY, - CLUSTER_HANDLER_REGISTRY, -) if TYPE_CHECKING: from zigpy import Endpoint as ZigpyEndpoint - from zha.zigbee.cluster_handlers import ClientClusterHandler from zha.zigbee.device import Device ATTR_DEVICE_TYPE: Final[str] = "device_type" @@ -36,7 +24,53 @@ ATTR_OUT_CLUSTERS: Final[str] = "output_clusters" _LOGGER = logging.getLogger(__name__) -CALLABLE_T = TypeVar("CALLABLE_T", bound=Callable) + + +def cluster_event_unique_id(endpoint: Endpoint, cluster: zigpy.zcl.Cluster) -> str: + """Build the `ieee:endpoint_id:0xCLUSTER[_CLIENT]` unique_id for a cluster event.""" + ieee_with_colons = endpoint.unique_id.replace("-", ":") + suffix = "_CLIENT" if cluster.is_client else "" + return f"{ieee_with_colons}:0x{cluster.cluster_id:04x}{suffix}" + + +def split_event_arg( + command: str, arg: list | dict | CommandSchema | None +) -> tuple[list | dict, dict[str, Any]]: + """Decompose a cluster-event argument into ZHA event `args`/`params`.""" + if arg is None: + return [], {} + if isinstance(arg, CommandSchema): + return [a for a in arg if a is not None], arg.as_dict() + if isinstance(arg, (list, dict)): + return arg, {} + raise TypeError(f"Unexpected cluster event {command!r} argument: {arg!r}") + + +class _ClusterEventForwarder: + """Forwards quirk `zha_send_event` listener calls into device `zha_event`s.""" + + def __init__(self, cluster: zigpy.zcl.Cluster, endpoint: Endpoint) -> None: + self._cluster = cluster + self._endpoint = endpoint + self._unique_id = cluster_event_unique_id(endpoint, cluster) + cluster.add_listener(self) + + def remove(self) -> None: + """Detach from the cluster.""" + self._cluster.remove_listener(self) + + def zha_send_event(self, command: str, arg: list | dict | CommandSchema) -> None: + """Relay events to listeners.""" + args, params = split_event_arg(command, arg) + self._endpoint.emit_zha_event( + { + const.ATTR_UNIQUE_ID: self._unique_id, + const.ATTR_CLUSTER_ID: self._cluster.cluster_id, + const.ATTR_COMMAND: command, + const.ATTR_ARGS: args, + const.ATTR_PARAMS: params, + } + ) class Endpoint: @@ -48,43 +82,20 @@ def __init__(self, zigpy_endpoint: ZigpyEndpoint, device: Device) -> None: assert device is not None self._zigpy_endpoint: ZigpyEndpoint = zigpy_endpoint self._device: Device = device - self._all_cluster_handlers: dict[str, ClusterHandler] = {} - self._claimed_cluster_handlers: dict[str, ClusterHandler] = {} - self._client_cluster_handlers: dict[str, ClientClusterHandler] = {} self._unique_id: str = f"{device.unique_id}-{zigpy_endpoint.endpoint_id}" + self._forwarders: list[_ClusterEventForwarder] = [] def on_remove(self) -> None: """Run when endpoint is removed.""" - for handler in self.all_cluster_handlers.values(): - handler.on_remove() - - self.all_cluster_handlers.clear() - - for handler in self.client_cluster_handlers.values(): - handler.on_remove() - - self.client_cluster_handlers.clear() + for forwarder in self._forwarders: + forwarder.remove() + self._forwarders.clear() @functools.cached_property def device(self) -> Device: """Return the device this endpoint belongs to.""" return self._device - @property - def all_cluster_handlers(self) -> dict[str, ClusterHandler]: - """All server cluster handlers of an endpoint.""" - return self._all_cluster_handlers - - @property - def claimed_cluster_handlers(self) -> dict[str, ClusterHandler]: - """Cluster handlers in use.""" - return self._claimed_cluster_handlers - - @property - def client_cluster_handlers(self) -> dict[str, ClientClusterHandler]: - """Return a dict of client cluster handlers.""" - return self._client_cluster_handlers - @functools.cached_property def zigpy_endpoint(self) -> ZigpyEndpoint: """Return endpoint of zigpy device.""" @@ -95,16 +106,6 @@ def id(self) -> int: """Return endpoint id.""" return self._zigpy_endpoint.endpoint_id - @functools.cached_property - def cluster_handlers_by_name(self) -> dict[str, ClusterHandler]: - """Return cluster handlers indexed by name.""" - return {ch.name: ch for ch in self._all_cluster_handlers.values()} - - @functools.cached_property - def client_cluster_handlers_by_name(self) -> dict[str, ClientClusterHandler]: - """Return client cluster handlers indexed by name.""" - return {ch.name: ch for ch in self._client_cluster_handlers.values()} - @functools.cached_property def unique_id(self) -> str: """Return the unique id for this endpoint.""" @@ -135,127 +136,28 @@ def zigbee_signature(self) -> tuple[int, dict[str, Any]]: @classmethod def new(cls, zigpy_endpoint: ZigpyEndpoint, device: Device) -> Endpoint: - """Create new endpoint and populate cluster handlers.""" + """Create new endpoint and attach quirk-event forwarders to each cluster.""" endpoint = cls(zigpy_endpoint, device) - endpoint.add_all_cluster_handlers() - endpoint.add_client_cluster_handlers() - + endpoint._attach_legacy_event_forwarders() return endpoint - def add_all_cluster_handlers(self) -> None: - """Create and add cluster handlers for all input clusters.""" + def _attach_legacy_event_forwarders(self) -> None: + """Attach legacy quirk-event forwarders to every server and client cluster.""" profile_id = self._zigpy_endpoint.profile_id if profile_id is None: _LOGGER.debug("Skipping endpoint, profile is None") return - elif profile_id not in (ZLL_PROFILE_ID, ZHA_PROFILE_ID): + if profile_id not in (ZLL_PROFILE_ID, ZHA_PROFILE_ID): _LOGGER.debug( - "Skipping endpoint, profile is not ZLL or ZHA: 0x%04X", - profile_id, + "Skipping endpoint, profile is not ZLL or ZHA: 0x%04X", profile_id ) return - for cluster_id, cluster in self.zigpy_endpoint.in_clusters.items(): - cluster_handler_classes = CLUSTER_HANDLER_REGISTRY.get( - cluster_id, {None: ClusterHandler} - ) - - # get first exposed feature from device - # that matches a registered cluster handler - cluster_exposed_features: str | None = None - for exposed_features in self.device.exposes_features: - if exposed_features in cluster_handler_classes: - cluster_exposed_features = exposed_features - break - - cluster_handler_class = cluster_handler_classes.get( - cluster_exposed_features, ClusterHandler - ) - - # Allow cluster handler to filter out bad matches - if not cluster_handler_class.matches(cluster, self): - cluster_handler_class = ClusterHandler - - _LOGGER.debug( - "Creating cluster handler for cluster id: %s class: %s", - cluster_id, - cluster_handler_class, - ) - - try: - cluster_handler = cluster_handler_class(cluster, self) - except KeyError as err: - _LOGGER.warning( - "Cluster handler %s for cluster %s on endpoint %s is invalid: %s", - cluster_handler_class, - cluster, - self, - err, - ) - continue - - if cluster_handler.name == CLUSTER_HANDLER_POWER_CONFIGURATION: - self._device.power_configuration_ch = cluster_handler - elif cluster_handler.name == CLUSTER_HANDLER_IDENTIFY: - self._device.identify_ch = cluster_handler - elif cluster_handler.name == CLUSTER_HANDLER_BASIC: - self._device.basic_ch = cluster_handler - - self._all_cluster_handlers[cluster_handler.id] = cluster_handler - cluster_handler.on_add() - - def add_client_cluster_handlers(self) -> None: - """Create client cluster handlers for all output clusters if in the registry.""" - for ( - cluster_id, - cluster_handler_class, - ) in CLIENT_CLUSTER_HANDLER_REGISTRY.items(): - cluster = self.zigpy_endpoint.out_clusters.get(cluster_id) - if cluster is not None: - _LOGGER.debug( - "Creating client cluster handler for cluster id: %s class: %s", - cluster_id, - cluster_handler_class, - ) - cluster_handler = cluster_handler_class(cluster, self) - self.client_cluster_handlers[cluster_handler.id] = cluster_handler - cluster_handler.on_add() - - async def async_initialize(self, from_cache: bool = False) -> None: - """Initialize claimed cluster handlers.""" - await self._execute_handler_tasks( - "async_initialize", from_cache, max_concurrency=1 - ) - - async def async_configure(self) -> None: - """Configure claimed cluster handlers.""" - await self._execute_handler_tasks("async_configure") - - async def _execute_handler_tasks( - self, func_name: str, *args: Any, max_concurrency: int | None = None - ) -> None: - """Add a throttled cluster handler task and swallow exceptions.""" - cluster_handlers = [ - *self.claimed_cluster_handlers.values(), - *self.client_cluster_handlers.values(), - ] - tasks = [getattr(ch, func_name)(*args) for ch in cluster_handlers] - - gather: Callable[..., Awaitable] - - if max_concurrency is None: - gather = asyncio.gather - else: - gather = functools.partial(gather_with_limited_concurrency, max_concurrency) - - results = await gather(*tasks, return_exceptions=True) - for cluster_handler, outcome in zip(cluster_handlers, results): - if isinstance(outcome, Exception): - cluster_handler.debug( - "'%s' stage failed: %s", func_name, str(outcome), exc_info=outcome - ) - else: - cluster_handler.debug("'%s' stage succeeded", func_name) + for cluster in ( + *self._zigpy_endpoint.in_clusters.values(), + *self._zigpy_endpoint.out_clusters.values(), + ): + self._forwarders.append(_ClusterEventForwarder(cluster, self)) def emit_zha_event(self, event_data: dict[str, Any]) -> None: """Broadcast an event from this endpoint.""" @@ -266,7 +168,3 @@ def emit_zha_event(self, event_data: dict[str, Any]) -> None: **event_data, } ) - - def claim_cluster_handlers(self, cluster_handlers: list[ClusterHandler]) -> None: - """Claim cluster handlers.""" - self.claimed_cluster_handlers.update({ch.id: ch for ch in cluster_handlers})