diff --git a/homeassistant/components/homematicip_cloud/icons.json b/homeassistant/components/homematicip_cloud/icons.json
index 2e9f6158c357bc569bd1418db46c4295a7c82092..73c60ea8cddc8b3fe04e18088e48b11cc640264f 100644
--- a/homeassistant/components/homematicip_cloud/icons.json
+++ b/homeassistant/components/homematicip_cloud/icons.json
@@ -7,6 +7,7 @@
"deactivate_vacation": "mdi:compass-off",
"set_active_climate_profile": "mdi:home-thermometer",
"dump_hap_config": "mdi:database-export",
- "reset_energy_counter": "mdi:reload"
+ "reset_energy_counter": "mdi:reload",
+ "set_home_cooling_mode": "mdi:snowflake"
}
}
diff --git a/homeassistant/components/homematicip_cloud/manifest.json b/homeassistant/components/homematicip_cloud/manifest.json
index 024cb2d9f2186d68f0041be8d6bcdcb3bdf155c1..b3e7eb9a72adba7a7c392f2e7b7035e326683c68 100644
--- a/homeassistant/components/homematicip_cloud/manifest.json
+++ b/homeassistant/components/homematicip_cloud/manifest.json
@@ -7,5 +7,5 @@
"iot_class": "cloud_push",
"loggers": ["homematicip"],
"quality_scale": "silver",
- "requirements": ["homematicip==1.1.1"]
+ "requirements": ["homematicip==1.1.2"]
}
diff --git a/homeassistant/components/homematicip_cloud/services.py b/homeassistant/components/homematicip_cloud/services.py
index 37cda9e7683457df8363ca9f03930c53f61a64e8..4c04e4a858b7046da666dd91c22bd9ed033ffb2f 100644
--- a/homeassistant/components/homematicip_cloud/services.py
+++ b/homeassistant/components/homematicip_cloud/services.py
@@ -13,6 +13,7 @@ import voluptuous as vol
from homeassistant.const import ATTR_ENTITY_ID, ATTR_TEMPERATURE
from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.exceptions import ServiceValidationError
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.config_validation import comp_entity_ids
from homeassistant.helpers.service import (
@@ -31,6 +32,7 @@ ATTR_CONFIG_OUTPUT_FILE_PREFIX = "config_output_file_prefix"
ATTR_CONFIG_OUTPUT_PATH = "config_output_path"
ATTR_DURATION = "duration"
ATTR_ENDTIME = "endtime"
+ATTR_COOLING = "cooling"
DEFAULT_CONFIG_FILE_PREFIX = "hmip-config"
@@ -42,6 +44,7 @@ SERVICE_DEACTIVATE_VACATION = "deactivate_vacation"
SERVICE_DUMP_HAP_CONFIG = "dump_hap_config"
SERVICE_RESET_ENERGY_COUNTER = "reset_energy_counter"
SERVICE_SET_ACTIVE_CLIMATE_PROFILE = "set_active_climate_profile"
+SERVICE_SET_HOME_COOLING_MODE = "set_home_cooling_mode"
HMIPC_SERVICES = [
SERVICE_ACTIVATE_ECO_MODE_WITH_DURATION,
@@ -52,6 +55,7 @@ HMIPC_SERVICES = [
SERVICE_DUMP_HAP_CONFIG,
SERVICE_RESET_ENERGY_COUNTER,
SERVICE_SET_ACTIVE_CLIMATE_PROFILE,
+ SERVICE_SET_HOME_COOLING_MODE,
]
SCHEMA_ACTIVATE_ECO_MODE_WITH_DURATION = vol.Schema(
@@ -107,6 +111,13 @@ SCHEMA_RESET_ENERGY_COUNTER = vol.Schema(
{vol.Required(ATTR_ENTITY_ID): comp_entity_ids}
)
+SCHEMA_SET_HOME_COOLING_MODE = vol.Schema(
+ {
+ vol.Optional(ATTR_COOLING, default=True): cv.boolean,
+ vol.Optional(ATTR_ACCESSPOINT_ID): vol.All(str, vol.Length(min=24, max=24)),
+ }
+)
+
async def async_setup_services(hass: HomeAssistant) -> None:
"""Set up the HomematicIP Cloud services."""
@@ -135,6 +146,8 @@ async def async_setup_services(hass: HomeAssistant) -> None:
await _async_reset_energy_counter(hass, service)
elif service_name == SERVICE_SET_ACTIVE_CLIMATE_PROFILE:
await _set_active_climate_profile(hass, service)
+ elif service_name == SERVICE_SET_HOME_COOLING_MODE:
+ await _async_set_home_cooling_mode(hass, service)
hass.services.async_register(
domain=HMIPC_DOMAIN,
@@ -194,6 +207,14 @@ async def async_setup_services(hass: HomeAssistant) -> None:
schema=SCHEMA_RESET_ENERGY_COUNTER,
)
+ async_register_admin_service(
+ hass=hass,
+ domain=HMIPC_DOMAIN,
+ service=SERVICE_SET_HOME_COOLING_MODE,
+ service_func=async_call_hmipc_service,
+ schema=SCHEMA_SET_HOME_COOLING_MODE,
+ )
+
async def async_unload_services(hass: HomeAssistant):
"""Unload HomematicIP Cloud services."""
@@ -324,10 +345,25 @@ async def _async_reset_energy_counter(hass: HomeAssistant, service: ServiceCall)
await device.reset_energy_counter()
+async def _async_set_home_cooling_mode(hass: HomeAssistant, service: ServiceCall):
+ """Service to set the cooling mode."""
+ cooling = service.data[ATTR_COOLING]
+
+ if hapid := service.data.get(ATTR_ACCESSPOINT_ID):
+ if home := _get_home(hass, hapid):
+ await home.set_cooling(cooling)
+ else:
+ for hap in hass.data[HMIPC_DOMAIN].values():
+ await hap.home.set_cooling(cooling)
+
+
def _get_home(hass: HomeAssistant, hapid: str) -> AsyncHome | None:
"""Return a HmIP home."""
if hap := hass.data[HMIPC_DOMAIN].get(hapid):
return hap.home
- _LOGGER.info("No matching access point found for access point id %s", hapid)
- return None
+ raise ServiceValidationError(
+ translation_domain=HMIPC_DOMAIN,
+ translation_key="access_point_not_found",
+ translation_placeholders={"id": hapid},
+ )
diff --git a/homeassistant/components/homematicip_cloud/services.yaml b/homeassistant/components/homematicip_cloud/services.yaml
index 9e8313397877f2215eab504b7b9ae87b5b6b6c63..aced5c838a6a599c8be08fa42b0a3b5b57afdc4e 100644
--- a/homeassistant/components/homematicip_cloud/services.yaml
+++ b/homeassistant/components/homematicip_cloud/services.yaml
@@ -98,3 +98,14 @@ reset_energy_counter:
example: switch.livingroom
selector:
text:
+
+set_home_cooling_mode:
+ fields:
+ cooling:
+ default: true
+ selector:
+ boolean:
+ accesspoint_id:
+ example: 3014xxxxxxxxxxxxxxxxxxxx
+ selector:
+ text:
diff --git a/homeassistant/components/homematicip_cloud/strings.json b/homeassistant/components/homematicip_cloud/strings.json
index 3795508d75dcff8ef99d5d9d5cb3e93f125399fc..a7c795c81f6d3721c0985841471e3b91d30a7a25 100644
--- a/homeassistant/components/homematicip_cloud/strings.json
+++ b/homeassistant/components/homematicip_cloud/strings.json
@@ -26,6 +26,11 @@
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
}
},
+ "exceptions": {
+ "access_point_not_found": {
+ "message": "No matching access point found for access point id {id}"
+ }
+ },
"services": {
"activate_eco_mode_with_duration": {
"name": "Activate eco mode with duration",
@@ -134,6 +139,20 @@
"description": "The ID of the measuring entity. Use 'all' keyword to reset all energy counters."
}
}
+ },
+ "set_home_cooling_mode": {
+ "name": "Set home cooling mode",
+ "description": "Set the heating/cooling mode for the entire home",
+ "fields": {
+ "accesspoint_id": {
+ "name": "[%key:component::homematicip_cloud::services::activate_eco_mode_with_duration::fields::accesspoint_id::name%]",
+ "description": "[%key:component::homematicip_cloud::services::activate_eco_mode_with_duration::fields::accesspoint_id::description%]"
+ },
+ "cooling": {
+ "name": "Cooling",
+ "description": "Enable for cooling mode, disable for heating mode"
+ }
+ }
}
}
}
diff --git a/requirements_all.txt b/requirements_all.txt
index d0bd63bd826ed048d5e1e033b8be63ec288849fc..9898da0e19eff24cdadbc60c3e253e5c38e61c88 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1105,7 +1105,7 @@ home-assistant-intents==2024.8.7
homeconnect==0.8.0
# homeassistant.components.homematicip_cloud
-homematicip==1.1.1
+homematicip==1.1.2
# homeassistant.components.horizon
horimote==0.4.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index b6c15fc89423e1f6ca1572e423c3c89f6cfcfb84..572e70bc2b86b7f106ee7b53f72664a263414e59 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -931,7 +931,7 @@ home-assistant-intents==2024.8.7
homeconnect==0.8.0
# homeassistant.components.homematicip_cloud
-homematicip==1.1.1
+homematicip==1.1.2
# homeassistant.components.remember_the_milk
httplib2==0.20.4
diff --git a/tests/components/homematicip_cloud/test_climate.py b/tests/components/homematicip_cloud/test_climate.py
index f175e2060df4bc442a590bf5aee7e3f8da5ad20e..2b4d023baf8b34f24b3761475818c43f19164886 100644
--- a/tests/components/homematicip_cloud/test_climate.py
+++ b/tests/components/homematicip_cloud/test_climate.py
@@ -622,16 +622,65 @@ async def test_hmip_climate_services(
assert len(home._connection.mock_calls) == 10
not_existing_hap_id = "5555F7110000000000000001"
+ with pytest.raises(ServiceValidationError) as excinfo:
+ await hass.services.async_call(
+ "homematicip_cloud",
+ "deactivate_vacation",
+ {"accesspoint_id": not_existing_hap_id},
+ blocking=True,
+ )
+ assert excinfo.value.translation_domain == HMIPC_DOMAIN
+ assert excinfo.value.translation_key == "access_point_not_found"
+ # There is no further call on connection.
+ assert len(home._connection.mock_calls) == 10
+
+
+async def test_hmip_set_home_cooling_mode(
+ hass: HomeAssistant, mock_hap_with_service
+) -> None:
+ """Test HomematicipSetHomeCoolingMode."""
+
+ home = mock_hap_with_service.home
+
await hass.services.async_call(
"homematicip_cloud",
- "deactivate_vacation",
- {"accesspoint_id": not_existing_hap_id},
+ "set_home_cooling_mode",
+ {"accesspoint_id": HAPID, "cooling": False},
blocking=True,
)
- assert home.mock_calls[-1][0] == "deactivate_vacation"
- assert home.mock_calls[-1][1] == ()
+ assert home.mock_calls[-1][0] == "set_cooling"
+ assert home.mock_calls[-1][1] == (False,)
+ assert len(home._connection.mock_calls) == 1
+
+ await hass.services.async_call(
+ "homematicip_cloud",
+ "set_home_cooling_mode",
+ {"accesspoint_id": HAPID, "cooling": True},
+ blocking=True,
+ )
+ assert home.mock_calls[-1][0] == "set_cooling"
+ assert home.mock_calls[-1][1]
+ assert len(home._connection.mock_calls) == 2
+
+ await hass.services.async_call(
+ "homematicip_cloud", "set_home_cooling_mode", blocking=True
+ )
+ assert home.mock_calls[-1][0] == "set_cooling"
+ assert home.mock_calls[-1][1]
+ assert len(home._connection.mock_calls) == 3
+
+ not_existing_hap_id = "5555F7110000000000000001"
+ with pytest.raises(ServiceValidationError) as excinfo:
+ await hass.services.async_call(
+ "homematicip_cloud",
+ "set_home_cooling_mode",
+ {"accesspoint_id": not_existing_hap_id, "cooling": True},
+ blocking=True,
+ )
+ assert excinfo.value.translation_domain == HMIPC_DOMAIN
+ assert excinfo.value.translation_key == "access_point_not_found"
# There is no further call on connection.
- assert len(home._connection.mock_calls) == 10
+ assert len(home._connection.mock_calls) == 3
async def test_hmip_heating_group_services(
diff --git a/tests/components/homematicip_cloud/test_init.py b/tests/components/homematicip_cloud/test_init.py
index 9303a755e8902dec9e245d9ea9bbd727c0905c0f..ad1c8140aea42f2299dbf8a2c0e584638cf45e3e 100644
--- a/tests/components/homematicip_cloud/test_init.py
+++ b/tests/components/homematicip_cloud/test_init.py
@@ -199,7 +199,7 @@ async def test_setup_services_and_unload_services(hass: HomeAssistant) -> None:
# Check services are created
hmipc_services = hass.services.async_services()[HMIPC_DOMAIN]
- assert len(hmipc_services) == 8
+ assert len(hmipc_services) == 9
config_entries = hass.config_entries.async_entries(HMIPC_DOMAIN)
assert len(config_entries) == 1
@@ -232,7 +232,7 @@ async def test_setup_two_haps_unload_one_by_one(hass: HomeAssistant) -> None:
assert await async_setup_component(hass, HMIPC_DOMAIN, {})
hmipc_services = hass.services.async_services()[HMIPC_DOMAIN]
- assert len(hmipc_services) == 8
+ assert len(hmipc_services) == 9
config_entries = hass.config_entries.async_entries(HMIPC_DOMAIN)
assert len(config_entries) == 2
@@ -241,7 +241,7 @@ async def test_setup_two_haps_unload_one_by_one(hass: HomeAssistant) -> None:
# services still exists
hmipc_services = hass.services.async_services()[HMIPC_DOMAIN]
- assert len(hmipc_services) == 8
+ assert len(hmipc_services) == 9
# unload the second AP
await hass.config_entries.async_unload(config_entries[1].entry_id)