diff --git a/homeassistant/components/airzone/entity.py b/homeassistant/components/airzone/entity.py index a05b8cd6181..9ee923ba1af 100644 --- a/homeassistant/components/airzone/entity.py +++ b/homeassistant/components/airzone/entity.py @@ -7,6 +7,7 @@ from typing import Any from aioairzone.const import ( API_SYSTEM_ID, API_ZONE_ID, + AZD_AVAILABLE, AZD_FIRMWARE, AZD_FULL_NAME, AZD_ID, @@ -66,6 +67,11 @@ class AirzoneSystemEntity(AirzoneEntity): ) self._attr_unique_id = entry.unique_id or entry.entry_id + @property + def available(self) -> bool: + """Return system availability.""" + return super().available and self.get_airzone_value(AZD_AVAILABLE) + def get_airzone_value(self, key: str) -> Any: """Return system value by key.""" value = None @@ -130,6 +136,11 @@ class AirzoneZoneEntity(AirzoneEntity): ) self._attr_unique_id = entry.unique_id or entry.entry_id + @property + def available(self) -> bool: + """Return zone availability.""" + return super().available and self.get_airzone_value(AZD_AVAILABLE) + def get_airzone_value(self, key: str) -> Any: """Return zone value by key.""" value = None diff --git a/homeassistant/components/airzone/manifest.json b/homeassistant/components/airzone/manifest.json index d55ffd187fd..9fbdd95518e 100644 --- a/homeassistant/components/airzone/manifest.json +++ b/homeassistant/components/airzone/manifest.json @@ -11,5 +11,5 @@ "documentation": "https://www.home-assistant.io/integrations/airzone", "iot_class": "local_polling", "loggers": ["aioairzone"], - "requirements": ["aioairzone==0.5.6"] + "requirements": ["aioairzone==0.6.1"] } diff --git a/requirements_all.txt b/requirements_all.txt index a508ca89bfb..54de1740d7e 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -119,7 +119,7 @@ aioairq==0.2.4 aioairzone-cloud==0.1.6 # homeassistant.components.airzone -aioairzone==0.5.6 +aioairzone==0.6.1 # homeassistant.components.ambient_station aioambient==2023.04.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 09910f00c7d..61e30b3fb04 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -109,7 +109,7 @@ aioairq==0.2.4 aioairzone-cloud==0.1.6 # homeassistant.components.airzone -aioairzone==0.5.6 +aioairzone==0.6.1 # homeassistant.components.ambient_station aioambient==2023.04.0 diff --git a/tests/components/airzone/test_diagnostics.py b/tests/components/airzone/test_diagnostics.py index 2fa5a7d566a..33f0175bdb7 100644 --- a/tests/components/airzone/test_diagnostics.py +++ b/tests/components/airzone/test_diagnostics.py @@ -14,7 +14,6 @@ from aioairzone.const import ( AZD_SYSTEM, AZD_SYSTEMS, AZD_ZONES, - AZD_ZONES_NUM, RAW_HVAC, RAW_VERSION, RAW_WEBSERVER, @@ -93,7 +92,6 @@ async def test_config_entry_diagnostics( diag["coord_data"][AZD_SYSTEMS]["1"].items() >= { AZD_ID: 1, - AZD_ZONES_NUM: 5, }.items() ) diff --git a/tests/components/airzone/test_sensor.py b/tests/components/airzone/test_sensor.py index c72c083039e..1d778761ee1 100644 --- a/tests/components/airzone/test_sensor.py +++ b/tests/components/airzone/test_sensor.py @@ -1,8 +1,23 @@ """The sensor tests for the Airzone platform.""" -from homeassistant.core import HomeAssistant +from unittest.mock import patch -from .util import async_init_integration +from aioairzone.const import API_DATA, API_SYSTEMS + +from homeassistant.components.airzone.coordinator import SCAN_INTERVAL +from homeassistant.const import STATE_UNAVAILABLE +from homeassistant.core import HomeAssistant +from homeassistant.util.dt import utcnow + +from .util import ( + HVAC_MOCK, + HVAC_SYSTEMS_MOCK, + HVAC_VERSION_MOCK, + HVAC_WEBSERVER_MOCK, + async_init_integration, +) + +from tests.common import async_fire_time_changed async def test_airzone_create_sensors( @@ -58,3 +73,36 @@ async def test_airzone_create_sensors( state = hass.states.get("sensor.dkn_plus_humidity") assert state is None + + +async def test_airzone_sensors_availability( + hass: HomeAssistant, entity_registry_enabled_by_default: None +) -> None: + """Test sensors availability.""" + + await async_init_integration(hass) + + HVAC_MOCK_UNAVAILABLE_ZONE = {**HVAC_MOCK} + del HVAC_MOCK_UNAVAILABLE_ZONE[API_SYSTEMS][0][API_DATA][1] + + with patch( + "homeassistant.components.airzone.AirzoneLocalApi.get_hvac", + return_value=HVAC_MOCK_UNAVAILABLE_ZONE, + ), patch( + "homeassistant.components.airzone.AirzoneLocalApi.get_hvac_systems", + return_value=HVAC_SYSTEMS_MOCK, + ), patch( + "homeassistant.components.airzone.AirzoneLocalApi.get_version", + return_value=HVAC_VERSION_MOCK, + ), patch( + "homeassistant.components.airzone.AirzoneLocalApi.get_webserver", + return_value=HVAC_WEBSERVER_MOCK, + ): + async_fire_time_changed(hass, utcnow() + SCAN_INTERVAL) + await hass.async_block_till_done() + + state = hass.states.get("sensor.dorm_ppal_temperature") + assert state.state == STATE_UNAVAILABLE + + state = hass.states.get("sensor.dorm_ppal_humidity") + assert state.state == STATE_UNAVAILABLE