Base ZGP device support

pyproject.toml

@@ -102,36 +102,42 @@ non_interactive = true
 # `python -m tools.regenerate_mypy_ignores`. They are sorted easiest-to-fix
 # first; clean up a module's errors and re-run the tool to shrink the list.
 # Autogenerated mypy overrides: start
+# Total ignored errors: 182 across 20 modules
 [[tool.mypy.overrides]]
 module = "zha.application.platforms.virtual"
 disable_error_code = [
     "no-any-return",  # 1
 ]
 
 [[tool.mypy.overrides]]
-module = "zha.quirks"
+module = "zha.zigbee.group"
 disable_error_code = [
-    "no-any-return",  # 1
+    "return-value",  # 1
 ]
 
 [[tool.mypy.overrides]]
-module = "zha.application.platforms.number"
+module = "zha.application.gateway"
 disable_error_code = [
-    "no-any-return",  # 2
+    "assignment",  # 2
 ]
 
 [[tool.mypy.overrides]]
-module = "zha.application.discovery"
+module = "zha.application.platforms"
 disable_error_code = [
-    "no-any-return",  # 3
+    "arg-type",  # 1
+    "assignment",  # 1
 ]
 
 [[tool.mypy.overrides]]
-module = "zha.application.platforms"
+module = "zha.application.platforms.number"
 disable_error_code = [
-    "arg-type",  # 1
-    "assignment",  # 1
-    "no-any-return",  # 1
+    "no-any-return",  # 2
+]
+
+[[tool.mypy.overrides]]
+module = "zha.application.discovery"
+disable_error_code = [
+    "no-any-return",  # 3
 ]
 
 [[tool.mypy.overrides]]
@@ -177,29 +183,19 @@ disable_error_code = [
     "no-untyped-def",  # 4
 ]
 
-[[tool.mypy.overrides]]
-module = "zha.zigbee.group"
-disable_error_code = [
-    "no-untyped-def",  # 3
-    "return-value",  # 2
-]
-
 [[tool.mypy.overrides]]
 module = "zha.application.platforms.fan"
 disable_error_code = [
     "arg-type",  # 2
-    "index",  # 1
     "no-any-return",  # 3
     "no-untyped-def",  # 1
 ]
 
 [[tool.mypy.overrides]]
-module = "zha.application.gateway"
+module = "zha.application.helpers"
 disable_error_code = [
-    "arg-type",  # 3
-    "assignment",  # 2
-    "no-untyped-call",  # 4
-    "return-value",  # 1
+    "arg-type",  # 2
+    "no-untyped-def",  # 5
 ]
 
 [[tool.mypy.overrides]]
@@ -218,52 +214,41 @@ disable_error_code = [
 ]
 
 [[tool.mypy.overrides]]
-module = "zha.application.helpers"
+module = "zha.zigbee.device"
 disable_error_code = [
-    "arg-type",  # 2
-    "no-untyped-call",  # 4
-    "no-untyped-def",  # 10
+    "arg-type",  # 1
+    "no-untyped-call",  # 2
+    "union-attr",  # 13
 ]
 
 [[tool.mypy.overrides]]
 module = "zha.application.platforms.light"
 disable_error_code = [
     "arg-type",  # 3
-    "no-any-return",  # 4
+    "no-any-return",  # 3
     "no-untyped-call",  # 11
     "no-untyped-def",  # 8
     "type-var",  # 2
 ]
 
-[[tool.mypy.overrides]]
-module = "zha.application.platforms.climate"
-disable_error_code = [
-    "call-overload",  # 4
-    "no-any-return",  # 23
-    "no-untyped-def",  # 8
-]
-
 [[tool.mypy.overrides]]
 module = "zha.application.platforms.sensor"
 disable_error_code = [
-    "arg-type",  # 12
+    "arg-type",  # 11
     "assignment",  # 2
-    "attr-defined",  # 5
+    "attr-defined",  # 2
     "no-any-return",  # 9
     "no-untyped-call",  # 4
     "no-untyped-def",  # 3
-    "operator",  # 4
+    "operator",  # 2
 ]
 
 [[tool.mypy.overrides]]
-module = "zha.zigbee.device"
+module = "zha.application.platforms.climate"
 disable_error_code = [
-    "arg-type",  # 12
-    "no-any-return",  # 4
-    "no-untyped-call",  # 3
-    "no-untyped-def",  # 10
-    "return-value",  # 1
-    "union-attr",  # 18
+    "call-overload",  # 4
+    "no-any-return",  # 23
+    "no-untyped-def",  # 8
 ]
 # Autogenerated mypy overrides: end
 

tests/test_device.py

@@ -315,6 +315,80 @@ async def test_check_available_no_basic_cluster(
     assert "does not have a mandatory basic cluster" in caplog.text
 
 
+async def test_check_available_skips_stale_coordinator(
+    zha_gateway: Gateway,
+) -> None:
+    """Check that a former coordinator is not marked unavailable."""
+    old_coord_dev = zigpy_device(
+        zha_gateway,
+        with_basic_cluster=False,
+        ieee="aa:bb:cc:dd:ee:ff:00:12",
+        nwk=0x0000,
+    )
+    old_coord_dev.node_desc = old_coord_dev.node_desc.replace(
+        logical_type=zdo_t.LogicalType.Coordinator
+    )
+    zha_device = await join_zigpy_device(zha_gateway, old_coord_dev)
+
+    assert not zha_device.is_active_coordinator
+    assert zha_device.available is True
+
+    old_coord_dev.last_seen = time.time() - zha_device.consider_unavailable_time - 2
+    await _send_time_changed(
+        zha_gateway, zha_gateway._device_availability_checker.__polling_interval + 1
+    )
+
+    assert zha_device.available is True
+
+
+async def test_check_available_skips_active_coordinator(
+    zha_gateway: Gateway,
+) -> None:
+    """Check that the active coordinator is never marked unavailable."""
+    coord_dev = zigpy_device(
+        zha_gateway,
+        with_basic_cluster=False,
+        ieee="aa:bb:cc:dd:ee:ff:00:11",
+        nwk=0x0000,
+    )
+    coord_dev.node_desc = coord_dev.node_desc.replace(
+        logical_type=zdo_t.LogicalType.Coordinator
+    )
+    zha_device = await join_zigpy_device(zha_gateway, coord_dev)
+    zha_gateway.application_controller.state.node_info.ieee = coord_dev.ieee
+
+    assert zha_device.is_active_coordinator
+    assert zha_device.available is True
+
+    coord_dev.last_seen = time.time() - zha_device.consider_unavailable_time - 2
+    await zha_device._check_available()
+
+    # `available` is always True for the active coordinator, so check the raw flag
+    assert zha_device._available is True
+    assert zha_device.available is True
+
+
+async def test_discover_entities_skips_zdo_endpoint(
+    zha_gateway: Gateway,
+) -> None:
+    """Check that endpoint 0 is never passed to endpoint entity discovery."""
+    zha_device = await join_zigpy_device(
+        zha_gateway, zigpy_device(zha_gateway, with_basic_cluster=True)
+    )
+    # `Device.endpoints` only holds non-ZDO endpoints, so ep 0 is injected
+    zha_device._endpoints[0] = mock.MagicMock()
+
+    with patch(
+        "zha.zigbee.device.discovery.discover_entities_for_endpoint",
+        return_value=iter(()),
+    ) as discover:
+        list(zha_device.discover_entities())
+
+    discovered = {c.args[0] for c in discover.mock_calls}
+    assert zha_device._endpoints[0] not in discovered
+    assert discovered == {ep for i, ep in zha_device._endpoints.items() if i != 0}
+
+
 async def test_device_is_active_coordinator(
     zha_gateway: Gateway,
 ) -> None: