From 7aca007a9a092075acaaf28b16d527bafb2d8115 Mon Sep 17 00:00:00 2001 From: "David F. Mulcahey" Date: Tue, 24 May 2022 19:44:33 -0400 Subject: [PATCH] Don't discover entities or initialize cluster channels for the coordinator in ZHA (#72442) don't discover coord entities or init channels --- homeassistant/components/zha/core/channels/__init__.py | 3 ++- homeassistant/components/zha/core/device.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/zha/core/channels/__init__.py b/homeassistant/components/zha/core/channels/__init__.py index 00409794473..a0df976486f 100644 --- a/homeassistant/components/zha/core/channels/__init__.py +++ b/homeassistant/components/zha/core/channels/__init__.py @@ -277,7 +277,8 @@ class ChannelPool: pool = cls(channels, ep_id) pool.add_all_channels() pool.add_client_channels() - zha_disc.PROBE.discover_entities(pool) + if not channels.zha_device.is_coordinator: + zha_disc.PROBE.discover_entities(pool) return pool @callback diff --git a/homeassistant/components/zha/core/device.py b/homeassistant/components/zha/core/device.py index 854d80ffb78..e5b3403ba54 100644 --- a/homeassistant/components/zha/core/device.py +++ b/homeassistant/components/zha/core/device.py @@ -273,7 +273,7 @@ class ZHADevice(LogMixin): @property def skip_configuration(self) -> bool: """Return true if the device should not issue configuration related commands.""" - return self._zigpy_device.skip_configuration + return self._zigpy_device.skip_configuration or self.is_coordinator @property def gateway(self):