Fix zone config (#32963)

* Fix zone config

* Add zone as dependency again to device tracker

* Fix tests

homeassistant/components/device_tracker/manifest.json

@@ -3,8 +3,8 @@
   "name": "Device Tracker",
   "documentation": "https://www.home-assistant.io/integrations/device_tracker",
   "requirements": [],
-  "dependencies": [],
+  "dependencies": ["zone"],
-  "after_dependencies": ["zone"],
+  "after_dependencies": [],
   "codeowners": [],
   "quality_scale": "internal"
 }

homeassistant/components/zone/__init__.py

@@ -18,6 +18,7 @@ from homeassistant.const import (
     CONF_RADIUS,
     EVENT_CORE_CONFIG_UPDATE,
     SERVICE_RELOAD,
+    STATE_UNAVAILABLE,
 )
 from homeassistant.core import Event, HomeAssistant, ServiceCall, State, callback
 from homeassistant.helpers import (
@@ -65,8 +66,20 @@ UPDATE_FIELDS = {
 }
 
 
+def empty_value(value):
+    """Test if the user has the default config value from adding "zone:"."""
+    if isinstance(value, dict) and len(value) == 0:
+        return []
+
+    raise vol.Invalid("Not a default value")
+
+
 CONFIG_SCHEMA = vol.Schema(
-    {vol.Optional(DOMAIN): vol.All(cv.ensure_list, [vol.Schema(CREATE_FIELDS)])},
+    {
+        vol.Optional(DOMAIN, default=[]): vol.Any(
+            vol.All(cv.ensure_list, [vol.Schema(CREATE_FIELDS)]), empty_value,
+        )
+    },
     extra=vol.ALLOW_EXTRA,
 )
 
@@ -93,7 +106,7 @@ def async_active_zone(
     closest = None
 
     for zone in zones:
-        if zone.attributes.get(ATTR_PASSIVE):
+        if zone.state == STATE_UNAVAILABLE or zone.attributes.get(ATTR_PASSIVE):
             continue
 
         zone_dist = distance(
@@ -126,6 +139,9 @@ def in_zone(zone: State, latitude: float, longitude: float, radius: float = 0) -
 
     Async friendly.
     """
+    if zone.state == STATE_UNAVAILABLE:
+        return False
+
     zone_dist = distance(
         latitude,
         longitude,
@@ -180,7 +196,7 @@ async def async_setup(hass: HomeAssistant, config: Dict) -> bool:
         component, storage_collection, lambda conf: Zone(conf, True)
     )
 
-    if DOMAIN in config:
+    if config[DOMAIN]:
         await yaml_collection.async_load(config[DOMAIN])
 
     await storage_collection.async_load()
@@ -206,7 +222,7 @@ async def async_setup(hass: HomeAssistant, config: Dict) -> bool:
         conf = await component.async_prepare_reload(skip_reset=True)
         if conf is None:
             return
-        await yaml_collection.async_load(conf.get(DOMAIN, []))
+        await yaml_collection.async_load(conf[DOMAIN])
 
     service.async_register_admin_service(
         hass,

tests/components/unifi/test_device_tracker.py

@@ -109,7 +109,7 @@ async def test_no_clients(hass):
     """Test the update_clients function when no clients are found."""
     await setup_unifi_integration(hass)
 
-    assert len(hass.states.async_all()) == 0
+    assert len(hass.states.async_entity_ids("device_tracker")) == 0
 
 
 async def test_tracked_devices(hass):
@@ -124,7 +124,7 @@ async def test_tracked_devices(hass):
         devices_response=[DEVICE_1, DEVICE_2],
         known_wireless_clients=(CLIENT_4["mac"],),
     )
-    assert len(hass.states.async_all()) == 5
+    assert len(hass.states.async_entity_ids("device_tracker")) == 5
 
     client_1 = hass.states.get("device_tracker.client_1")
     assert client_1 is not None
@@ -185,7 +185,7 @@ async def test_controller_state_change(hass):
     controller = await setup_unifi_integration(
         hass, clients_response=[CLIENT_1], devices_response=[DEVICE_1],
     )
-    assert len(hass.states.async_all()) == 2
+    assert len(hass.states.async_entity_ids("device_tracker")) == 2
 
     # Controller unavailable
     controller.async_unifi_signalling_callback(
@@ -215,7 +215,7 @@ async def test_option_track_clients(hass):
     controller = await setup_unifi_integration(
         hass, clients_response=[CLIENT_1, CLIENT_2], devices_response=[DEVICE_1],
     )
-    assert len(hass.states.async_all()) == 3
+    assert len(hass.states.async_entity_ids("device_tracker")) == 3
 
     client_1 = hass.states.get("device_tracker.client_1")
     assert client_1 is not None
@@ -260,7 +260,7 @@ async def test_option_track_wired_clients(hass):
     controller = await setup_unifi_integration(
         hass, clients_response=[CLIENT_1, CLIENT_2], devices_response=[DEVICE_1],
     )
-    assert len(hass.states.async_all()) == 3
+    assert len(hass.states.async_entity_ids("device_tracker")) == 3
 
     client_1 = hass.states.get("device_tracker.client_1")
     assert client_1 is not None
@@ -305,7 +305,7 @@ async def test_option_track_devices(hass):
     controller = await setup_unifi_integration(
         hass, clients_response=[CLIENT_1, CLIENT_2], devices_response=[DEVICE_1],
     )
-    assert len(hass.states.async_all()) == 3
+    assert len(hass.states.async_entity_ids("device_tracker")) == 3
 
     client_1 = hass.states.get("device_tracker.client_1")
     assert client_1 is not None
@@ -350,7 +350,7 @@ async def test_option_ssid_filter(hass):
     controller = await setup_unifi_integration(
         hass, options={CONF_SSID_FILTER: ["ssid"]}, clients_response=[CLIENT_3],
     )
-    assert len(hass.states.async_all()) == 0
+    assert len(hass.states.async_entity_ids("device_tracker")) == 0
 
     # SSID filter active
     client_3 = hass.states.get("device_tracker.client_3")
@@ -388,7 +388,7 @@ async def test_wireless_client_go_wired_issue(hass):
     client_1_client["last_seen"] = dt_util.as_timestamp(dt_util.utcnow())
 
     controller = await setup_unifi_integration(hass, clients_response=[client_1_client])
-    assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_entity_ids("device_tracker")) == 1
 
     client_1 = hass.states.get("device_tracker.client_1")
     assert client_1 is not None
@@ -461,7 +461,7 @@ async def test_restoring_client(hass):
         clients_response=[CLIENT_2],
         clients_all_response=[CLIENT_1],
     )
-    assert len(hass.states.async_all()) == 2
+    assert len(hass.states.async_entity_ids("device_tracker")) == 2
 
     device_1 = hass.states.get("device_tracker.client_1")
     assert device_1 is not None
@@ -475,7 +475,7 @@ async def test_dont_track_clients(hass):
         clients_response=[CLIENT_1],
         devices_response=[DEVICE_1],
     )
-    assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_entity_ids("device_tracker")) == 1
 
     client_1 = hass.states.get("device_tracker.client_1")
     assert client_1 is None
@@ -493,7 +493,7 @@ async def test_dont_track_devices(hass):
         clients_response=[CLIENT_1],
         devices_response=[DEVICE_1],
     )
-    assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_entity_ids("device_tracker")) == 1
 
     client_1 = hass.states.get("device_tracker.client_1")
     assert client_1 is not None
@@ -510,7 +510,7 @@ async def test_dont_track_wired_clients(hass):
         options={unifi.controller.CONF_TRACK_WIRED_CLIENTS: False},
         clients_response=[CLIENT_1, CLIENT_2],
     )
-    assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_entity_ids("device_tracker")) == 1
 
     client_1 = hass.states.get("device_tracker.client_1")
     assert client_1 is not None

tests/components/unifi/test_sensor.py

@@ -55,7 +55,7 @@ async def test_no_clients(hass):
     )
 
     assert len(controller.mock_requests) == 4
-    assert len(hass.states.async_all()) == 0
+    assert len(hass.states.async_entity_ids("sensor")) == 0
 
 
 async def test_sensors(hass):
@@ -71,7 +71,7 @@ async def test_sensors(hass):
     )
 
     assert len(controller.mock_requests) == 4
-    assert len(hass.states.async_all()) == 4
+    assert len(hass.states.async_entity_ids("sensor")) == 4
 
     wired_client_rx = hass.states.get("sensor.wired_client_name_rx")
     assert wired_client_rx.state == "1234.0"

tests/components/unifi/test_switch.py

@@ -209,7 +209,7 @@ async def test_no_clients(hass):
     )
 
     assert len(controller.mock_requests) == 4
-    assert len(hass.states.async_all()) == 0
+    assert len(hass.states.async_entity_ids("switch")) == 0
 
 
 async def test_controller_not_client(hass):
@@ -222,7 +222,7 @@ async def test_controller_not_client(hass):
     )
 
     assert len(controller.mock_requests) == 4
-    assert len(hass.states.async_all()) == 0
+    assert len(hass.states.async_entity_ids("switch")) == 0
     cloudkey = hass.states.get("switch.cloud_key")
     assert cloudkey is None
 
@@ -240,7 +240,7 @@ async def test_not_admin(hass):
     )
 
     assert len(controller.mock_requests) == 4
-    assert len(hass.states.async_all()) == 0
+    assert len(hass.states.async_entity_ids("switch")) == 0
 
 
 async def test_switches(hass):
@@ -258,7 +258,7 @@ async def test_switches(hass):
     )
 
     assert len(controller.mock_requests) == 4
-    assert len(hass.states.async_all()) == 3
+    assert len(hass.states.async_entity_ids("switch")) == 3
 
     switch_1 = hass.states.get("switch.poe_client_1")
     assert switch_1 is not None
@@ -312,7 +312,7 @@ async def test_new_client_discovered_on_block_control(hass):
     )
 
     assert len(controller.mock_requests) == 4
-    assert len(hass.states.async_all()) == 0
+    assert len(hass.states.async_entity_ids("switch")) == 0
 
     blocked = hass.states.get("switch.block_client_1")
     assert blocked is None
@@ -324,7 +324,7 @@ async def test_new_client_discovered_on_block_control(hass):
     controller.api.session_handler("data")
     await hass.async_block_till_done()
 
-    assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_entity_ids("switch")) == 1
     blocked = hass.states.get("switch.block_client_1")
     assert blocked is not None
 
@@ -336,7 +336,7 @@ async def test_option_block_clients(hass):
         options={CONF_BLOCK_CLIENT: [BLOCKED["mac"]]},
         clients_all_response=[BLOCKED, UNBLOCKED],
     )
-    assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_entity_ids("switch")) == 1
 
     # Add a second switch
     hass.config_entries.async_update_entry(
@@ -344,28 +344,28 @@ async def test_option_block_clients(hass):
         options={CONF_BLOCK_CLIENT: [BLOCKED["mac"], UNBLOCKED["mac"]]},
     )
     await hass.async_block_till_done()
-    assert len(hass.states.async_all()) == 2
+    assert len(hass.states.async_entity_ids("switch")) == 2
 
     # Remove the second switch again
     hass.config_entries.async_update_entry(
         controller.config_entry, options={CONF_BLOCK_CLIENT: [BLOCKED["mac"]]},
     )
     await hass.async_block_till_done()
-    assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_entity_ids("switch")) == 1
 
     # Enable one and remove another one
     hass.config_entries.async_update_entry(
         controller.config_entry, options={CONF_BLOCK_CLIENT: [UNBLOCKED["mac"]]},
     )
     await hass.async_block_till_done()
-    assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_entity_ids("switch")) == 1
 
     # Remove one
     hass.config_entries.async_update_entry(
         controller.config_entry, options={CONF_BLOCK_CLIENT: []},
     )
     await hass.async_block_till_done()
-    assert len(hass.states.async_all()) == 0
+    assert len(hass.states.async_entity_ids("switch")) == 0
 
 
 async def test_new_client_discovered_on_poe_control(hass):
@@ -378,7 +378,7 @@ async def test_new_client_discovered_on_poe_control(hass):
     )
 
     assert len(controller.mock_requests) == 4
-    assert len(hass.states.async_all()) == 1
+    assert len(hass.states.async_entity_ids("switch")) == 1
 
     controller.api.websocket._data = {
         "meta": {"message": "sta:sync"},
@@ -391,7 +391,7 @@ async def test_new_client_discovered_on_poe_control(hass):
         "switch", "turn_off", {"entity_id": "switch.poe_client_1"}, blocking=True
     )
     assert len(controller.mock_requests) == 5
-    assert len(hass.states.async_all()) == 2
+    assert len(hass.states.async_entity_ids("switch")) == 2
     assert controller.mock_requests[4] == {
         "json": {
             "port_overrides": [{"port_idx": 1, "portconf_id": "1a1", "poe_mode": "off"}]
@@ -430,7 +430,7 @@ async def test_ignore_multiple_poe_clients_on_same_port(hass):
     )
 
     assert len(controller.mock_requests) == 4
-    assert len(hass.states.async_all()) == 3
+    assert len(hass.states.async_entity_ids("device_tracker")) == 3
 
     switch_1 = hass.states.get("switch.poe_client_1")
     switch_2 = hass.states.get("switch.poe_client_2")
@@ -481,7 +481,7 @@ async def test_restoring_client(hass):
     )
 
     assert len(controller.mock_requests) == 4
-    assert len(hass.states.async_all()) == 2
+    assert len(hass.states.async_entity_ids("switch")) == 2
 
     device_1 = hass.states.get("switch.client_1")
     assert device_1 is not None

tests/components/zone/test_init.py

@@ -487,3 +487,18 @@ async def test_import_config_entry(hass):
     assert state.attributes[zone.ATTR_RADIUS] == 3
     assert state.attributes[zone.ATTR_PASSIVE] is False
     assert state.attributes[ATTR_ICON] == "mdi:from-config-entry"
+
+
+async def test_zone_empty_setup(hass):
+    """Set up zone with empty config."""
+    assert await setup.async_setup_component(hass, DOMAIN, {"zone": {}})
+
+
+async def test_unavailable_zone(hass):
+    """Test active zone with unavailable zones."""
+    assert await setup.async_setup_component(hass, DOMAIN, {"zone": {}})
+    hass.states.async_set("zone.bla", "unavailable", {"restored": True})
+
+    assert zone.async_active_zone(hass, 0.0, 0.01) is None
+
+    assert zone.in_zone(hass.states.get("zone.bla"), 0, 0) is False