jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-20 11:47:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix utility_meter reset service (#69612)

Browse Source
This commit is contained in:
Diogo Gomes 2022-04-07 22:55:34 +01:00 committed by GitHub
parent 7ce9b5910a
commit a3cfb6d4ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
homeassistant/components/utility_meter/__init__.py
View File

@ -106,27 +106,24 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
async def async_reset_meters(service_call): async def async_reset_meters(service_call):
"""Reset all sensors of a meter.""" """Reset all sensors of a meter."""
entity_id = service_call.data["entity_id"] meters = service_call.data["entity_id"]
domain = split_entity_id(entity_id)[0] for meter in meters:
if domain == DOMAIN: _LOGGER.debug("resetting meter %s", meter)
for entity in hass.data[DATA_LEGACY_COMPONENT].entities: domain, entity = split_entity_id(meter)
if entity_id == entity.entity_id: # backward compatibility up to 2022.07:
_LOGGER.debug( if domain == DOMAIN:
"forward reset meter from %s to %s", async_dispatcher_send(
entity_id, hass, SIGNAL_RESET_METER, f"{SELECT_DOMAIN}.{entity}"
entity.tracked_entity_id, )
) else:
entity_id = entity.tracked_entity_id async_dispatcher_send(hass, SIGNAL_RESET_METER, meter)
_LOGGER.debug("reset meter %s", entity_id)
async_dispatcher_send(hass, SIGNAL_RESET_METER, entity_id)
hass.services.async_register( hass.services.async_register(
DOMAIN, DOMAIN,
SERVICE_RESET, SERVICE_RESET,
async_reset_meters, async_reset_meters,
vol.Schema({ATTR_ENTITY_ID: cv.entity_id}), vol.Schema({ATTR_ENTITY_ID: vol.All(cv.ensure_list, [cv.entity_id])}),
) )
if DOMAIN not in config: if DOMAIN not in config:

1
homeassistant/components/utility_meter/services.yaml
View File

@ -6,7 +6,6 @@ reset:
target: target:
entity: entity:
domain: select domain: select
integration: utility_meter
next_tariff: next_tariff:
name: Next Tariff name: Next Tariff

13
tests/components/utility_meter/test_init.py
View File

@ -66,7 +66,16 @@ async def test_restore_state(hass):
assert state.state == "midpeak" assert state.state == "midpeak"
async def test_services(hass): @pytest.mark.parametrize(
"meter",
(
["select.energy_bill"],
"select.energy_bill",
["utility_meter.energy_bill"],
"utility_meter.energy_bill",
),
)
async def test_services(hass, meter):
"""Test energy sensor reset service.""" """Test energy sensor reset service."""
config = { config = {
"utility_meter": { "utility_meter": {
@ -160,7 +169,7 @@ async def test_services(hass):
assert state.state == "1" assert state.state == "1"
# Reset meters # Reset meters
data = {ATTR_ENTITY_ID: "select.energy_bill"} data = {ATTR_ENTITY_ID: meter}
await hass.services.async_call(DOMAIN, SERVICE_RESET, data) await hass.services.async_call(DOMAIN, SERVICE_RESET, data)
await hass.async_block_till_done() await hass.async_block_till_done()