mirror of
https://github.com/home-assistant/core.git
synced 2025-07-09 06:17:07 +00:00
Use entity registry id in vacuum device conditions (#95261)
This commit is contained in:
parent
eb7ad2eb09
commit
2930845b23
@ -4,7 +4,6 @@ from __future__ import annotations
|
|||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
ATTR_ENTITY_ID,
|
|
||||||
CONF_CONDITION,
|
CONF_CONDITION,
|
||||||
CONF_DEVICE_ID,
|
CONF_DEVICE_ID,
|
||||||
CONF_DOMAIN,
|
CONF_DOMAIN,
|
||||||
@ -26,7 +25,7 @@ CONDITION_TYPES = {"is_cleaning", "is_docked"}
|
|||||||
|
|
||||||
CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
|
CONDITION_SCHEMA = DEVICE_CONDITION_BASE_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Required(CONF_ENTITY_ID): cv.entity_id,
|
vol.Required(CONF_ENTITY_ID): cv.entity_id_or_uuid,
|
||||||
vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
|
vol.Required(CONF_TYPE): vol.In(CONDITION_TYPES),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
@ -48,7 +47,7 @@ async def async_get_conditions(
|
|||||||
CONF_CONDITION: "device",
|
CONF_CONDITION: "device",
|
||||||
CONF_DEVICE_ID: device_id,
|
CONF_DEVICE_ID: device_id,
|
||||||
CONF_DOMAIN: DOMAIN,
|
CONF_DOMAIN: DOMAIN,
|
||||||
CONF_ENTITY_ID: entry.entity_id,
|
CONF_ENTITY_ID: entry.id,
|
||||||
}
|
}
|
||||||
|
|
||||||
conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
|
conditions += [{**base_condition, CONF_TYPE: cond} for cond in CONDITION_TYPES]
|
||||||
@ -66,9 +65,15 @@ def async_condition_from_config(
|
|||||||
else:
|
else:
|
||||||
test_states = [STATE_CLEANING, STATE_RETURNING]
|
test_states = [STATE_CLEANING, STATE_RETURNING]
|
||||||
|
|
||||||
|
registry = er.async_get(hass)
|
||||||
|
entity_id = er.async_resolve_entity_id(registry, config[CONF_ENTITY_ID])
|
||||||
|
|
||||||
def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
|
def test_is_state(hass: HomeAssistant, variables: TemplateVarsType) -> bool:
|
||||||
"""Test if an entity is a certain state."""
|
"""Test if an entity is a certain state."""
|
||||||
state = hass.states.get(config[ATTR_ENTITY_ID])
|
return (
|
||||||
return state is not None and state.state in test_states
|
entity_id is not None
|
||||||
|
and (state := hass.states.get(entity_id)) is not None
|
||||||
|
and state.state in test_states
|
||||||
|
)
|
||||||
|
|
||||||
return test_is_state
|
return test_is_state
|
||||||
|
@ -46,7 +46,7 @@ async def test_get_conditions(
|
|||||||
config_entry_id=config_entry.entry_id,
|
config_entry_id=config_entry.entry_id,
|
||||||
connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
|
connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
|
||||||
)
|
)
|
||||||
entity_registry.async_get_or_create(
|
entity_entry = entity_registry.async_get_or_create(
|
||||||
DOMAIN, "test", "5678", device_id=device_entry.id
|
DOMAIN, "test", "5678", device_id=device_entry.id
|
||||||
)
|
)
|
||||||
expected_conditions = [
|
expected_conditions = [
|
||||||
@ -55,7 +55,7 @@ async def test_get_conditions(
|
|||||||
"domain": DOMAIN,
|
"domain": DOMAIN,
|
||||||
"type": condition,
|
"type": condition,
|
||||||
"device_id": device_entry.id,
|
"device_id": device_entry.id,
|
||||||
"entity_id": f"{DOMAIN}.test_5678",
|
"entity_id": entity_entry.id,
|
||||||
"metadata": {"secondary": False},
|
"metadata": {"secondary": False},
|
||||||
}
|
}
|
||||||
for condition in ["is_cleaning", "is_docked"]
|
for condition in ["is_cleaning", "is_docked"]
|
||||||
@ -89,7 +89,7 @@ async def test_get_conditions_hidden_auxiliary(
|
|||||||
config_entry_id=config_entry.entry_id,
|
config_entry_id=config_entry.entry_id,
|
||||||
connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
|
connections={(dr.CONNECTION_NETWORK_MAC, "12:34:56:AB:CD:EF")},
|
||||||
)
|
)
|
||||||
entity_registry.async_get_or_create(
|
entity_entry = entity_registry.async_get_or_create(
|
||||||
DOMAIN,
|
DOMAIN,
|
||||||
"test",
|
"test",
|
||||||
"5678",
|
"5678",
|
||||||
@ -103,7 +103,7 @@ async def test_get_conditions_hidden_auxiliary(
|
|||||||
"domain": DOMAIN,
|
"domain": DOMAIN,
|
||||||
"type": condition,
|
"type": condition,
|
||||||
"device_id": device_entry.id,
|
"device_id": device_entry.id,
|
||||||
"entity_id": f"{DOMAIN}.test_5678",
|
"entity_id": entity_entry.id,
|
||||||
"metadata": {"secondary": True},
|
"metadata": {"secondary": True},
|
||||||
}
|
}
|
||||||
for condition in ["is_cleaning", "is_docked"]
|
for condition in ["is_cleaning", "is_docked"]
|
||||||
@ -114,9 +114,13 @@ async def test_get_conditions_hidden_auxiliary(
|
|||||||
assert conditions == unordered(expected_conditions)
|
assert conditions == unordered(expected_conditions)
|
||||||
|
|
||||||
|
|
||||||
async def test_if_state(hass: HomeAssistant, calls) -> None:
|
async def test_if_state(
|
||||||
|
hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
|
||||||
|
) -> None:
|
||||||
"""Test for turn_on and turn_off conditions."""
|
"""Test for turn_on and turn_off conditions."""
|
||||||
hass.states.async_set("vacuum.entity", STATE_DOCKED)
|
entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
|
||||||
|
|
||||||
|
hass.states.async_set(entry.entity_id, STATE_DOCKED)
|
||||||
|
|
||||||
assert await async_setup_component(
|
assert await async_setup_component(
|
||||||
hass,
|
hass,
|
||||||
@ -130,7 +134,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
|
|||||||
"condition": "device",
|
"condition": "device",
|
||||||
"domain": DOMAIN,
|
"domain": DOMAIN,
|
||||||
"device_id": "",
|
"device_id": "",
|
||||||
"entity_id": "vacuum.entity",
|
"entity_id": entry.id,
|
||||||
"type": "is_cleaning",
|
"type": "is_cleaning",
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@ -148,7 +152,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
|
|||||||
"condition": "device",
|
"condition": "device",
|
||||||
"domain": DOMAIN,
|
"domain": DOMAIN,
|
||||||
"device_id": "",
|
"device_id": "",
|
||||||
"entity_id": "vacuum.entity",
|
"entity_id": entry.id,
|
||||||
"type": "is_docked",
|
"type": "is_docked",
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@ -168,7 +172,7 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
|
|||||||
assert len(calls) == 1
|
assert len(calls) == 1
|
||||||
assert calls[0].data["some"] == "is_docked - event - test_event2"
|
assert calls[0].data["some"] == "is_docked - event - test_event2"
|
||||||
|
|
||||||
hass.states.async_set("vacuum.entity", STATE_CLEANING)
|
hass.states.async_set(entry.entity_id, STATE_CLEANING)
|
||||||
hass.bus.async_fire("test_event1")
|
hass.bus.async_fire("test_event1")
|
||||||
hass.bus.async_fire("test_event2")
|
hass.bus.async_fire("test_event2")
|
||||||
await hass.async_block_till_done()
|
await hass.async_block_till_done()
|
||||||
@ -176,9 +180,49 @@ async def test_if_state(hass: HomeAssistant, calls) -> None:
|
|||||||
assert calls[1].data["some"] == "is_cleaning - event - test_event1"
|
assert calls[1].data["some"] == "is_cleaning - event - test_event1"
|
||||||
|
|
||||||
# Returning means it's still cleaning
|
# Returning means it's still cleaning
|
||||||
hass.states.async_set("vacuum.entity", STATE_RETURNING)
|
hass.states.async_set(entry.entity_id, STATE_RETURNING)
|
||||||
hass.bus.async_fire("test_event1")
|
hass.bus.async_fire("test_event1")
|
||||||
hass.bus.async_fire("test_event2")
|
hass.bus.async_fire("test_event2")
|
||||||
await hass.async_block_till_done()
|
await hass.async_block_till_done()
|
||||||
assert len(calls) == 3
|
assert len(calls) == 3
|
||||||
assert calls[2].data["some"] == "is_cleaning - event - test_event1"
|
assert calls[2].data["some"] == "is_cleaning - event - test_event1"
|
||||||
|
|
||||||
|
|
||||||
|
async def test_if_state_legacy(
|
||||||
|
hass: HomeAssistant, entity_registry: er.EntityRegistry, calls
|
||||||
|
) -> None:
|
||||||
|
"""Test for turn_on and turn_off conditions."""
|
||||||
|
entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
|
||||||
|
|
||||||
|
hass.states.async_set(entry.entity_id, STATE_CLEANING)
|
||||||
|
|
||||||
|
assert await async_setup_component(
|
||||||
|
hass,
|
||||||
|
automation.DOMAIN,
|
||||||
|
{
|
||||||
|
automation.DOMAIN: [
|
||||||
|
{
|
||||||
|
"trigger": {"platform": "event", "event_type": "test_event1"},
|
||||||
|
"condition": [
|
||||||
|
{
|
||||||
|
"condition": "device",
|
||||||
|
"domain": DOMAIN,
|
||||||
|
"device_id": "",
|
||||||
|
"entity_id": entry.entity_id,
|
||||||
|
"type": "is_cleaning",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"action": {
|
||||||
|
"service": "test.automation",
|
||||||
|
"data_template": {
|
||||||
|
"some": "is_cleaning - {{ trigger.platform }} - {{ trigger.event.event_type }}"
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]
|
||||||
|
},
|
||||||
|
)
|
||||||
|
hass.bus.async_fire("test_event1")
|
||||||
|
await hass.async_block_till_done()
|
||||||
|
assert len(calls) == 1
|
||||||
|
assert calls[0].data["some"] == "is_cleaning - event - test_event1"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user