From 1b5eea5fae38283548fac2118049e6249cae467d Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Thu, 26 Feb 2026 16:40:13 +0100 Subject: [PATCH] Drop single-use service name constants in amberelectric (#164152) --- homeassistant/components/amberelectric/const.py | 2 -- .../components/amberelectric/services.py | 3 +-- tests/components/amberelectric/test_services.py | 16 ++++++++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/homeassistant/components/amberelectric/const.py b/homeassistant/components/amberelectric/const.py index 3a1dbc9023a..cfe840dcde8 100644 --- a/homeassistant/components/amberelectric/const.py +++ b/homeassistant/components/amberelectric/const.py @@ -16,8 +16,6 @@ ATTRIBUTION = "Data provided by Amber Electric" LOGGER = logging.getLogger(__package__) PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR] -SERVICE_GET_FORECASTS = "get_forecasts" - GENERAL_CHANNEL = "general" CONTROLLED_LOAD_CHANNEL = "controlled_load" FEED_IN_CHANNEL = "feed_in" diff --git a/homeassistant/components/amberelectric/services.py b/homeassistant/components/amberelectric/services.py index c4549498b91..f936d4a3d3c 100644 --- a/homeassistant/components/amberelectric/services.py +++ b/homeassistant/components/amberelectric/services.py @@ -22,7 +22,6 @@ from .const import ( DOMAIN, FEED_IN_CHANNEL, GENERAL_CHANNEL, - SERVICE_GET_FORECASTS, ) from .coordinator import AmberConfigEntry from .helpers import format_cents_to_dollars, normalize_descriptor @@ -101,7 +100,7 @@ def async_setup_services(hass: HomeAssistant) -> None: hass.services.async_register( DOMAIN, - SERVICE_GET_FORECASTS, + "get_forecasts", handle_get_forecasts, GET_FORECASTS_SCHEMA, supports_response=SupportsResponse.ONLY, diff --git a/tests/components/amberelectric/test_services.py b/tests/components/amberelectric/test_services.py index cec59fc8f75..c5737ebf523 100644 --- a/tests/components/amberelectric/test_services.py +++ b/tests/components/amberelectric/test_services.py @@ -5,7 +5,7 @@ import re import pytest import voluptuous as vol -from homeassistant.components.amberelectric.const import DOMAIN, SERVICE_GET_FORECASTS +from homeassistant.components.amberelectric.const import DOMAIN from homeassistant.components.amberelectric.services import ATTR_CHANNEL_TYPE from homeassistant.const import ATTR_CONFIG_ENTRY_ID from homeassistant.core import HomeAssistant @@ -30,7 +30,7 @@ async def test_get_general_forecasts( await setup_integration(hass, general_channel_config_entry) result = await hass.services.async_call( DOMAIN, - SERVICE_GET_FORECASTS, + "get_forecasts", {ATTR_CONFIG_ENTRY_ID: GENERAL_ONLY_SITE_ID, ATTR_CHANNEL_TYPE: "general"}, blocking=True, return_response=True, @@ -59,7 +59,7 @@ async def test_get_controlled_load_forecasts( await setup_integration(hass, general_channel_and_controlled_load_config_entry) result = await hass.services.async_call( DOMAIN, - SERVICE_GET_FORECASTS, + "get_forecasts", { ATTR_CONFIG_ENTRY_ID: GENERAL_AND_CONTROLLED_SITE_ID, ATTR_CHANNEL_TYPE: "controlled_load", @@ -91,7 +91,7 @@ async def test_get_feed_in_forecasts( await setup_integration(hass, general_channel_and_feed_in_config_entry) result = await hass.services.async_call( DOMAIN, - SERVICE_GET_FORECASTS, + "get_forecasts", { ATTR_CONFIG_ENTRY_ID: GENERAL_AND_FEED_IN_SITE_ID, ATTR_CHANNEL_TYPE: "feed_in", @@ -130,7 +130,7 @@ async def test_incorrect_channel_type( ): await hass.services.async_call( DOMAIN, - SERVICE_GET_FORECASTS, + "get_forecasts", { ATTR_CONFIG_ENTRY_ID: GENERAL_ONLY_SITE_ID, ATTR_CHANNEL_TYPE: "incorrect", @@ -153,7 +153,7 @@ async def test_unavailable_channel_type( ): await hass.services.async_call( DOMAIN, - SERVICE_GET_FORECASTS, + "get_forecasts", { ATTR_CONFIG_ENTRY_ID: GENERAL_ONLY_SITE_ID, ATTR_CHANNEL_TYPE: "controlled_load", @@ -178,7 +178,7 @@ async def test_service_entry_availability( with pytest.raises(ServiceValidationError) as err: await hass.services.async_call( DOMAIN, - SERVICE_GET_FORECASTS, + "get_forecasts", { ATTR_CONFIG_ENTRY_ID: mock_config_entry2.entry_id, ATTR_CHANNEL_TYPE: "general", @@ -192,7 +192,7 @@ async def test_service_entry_availability( with pytest.raises(ServiceValidationError) as err: await hass.services.async_call( DOMAIN, - SERVICE_GET_FORECASTS, + "get_forecasts", {ATTR_CONFIG_ENTRY_ID: "bad-config_id", ATTR_CHANNEL_TYPE: "general"}, blocking=True, return_response=True,