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

Use entity registry id in alarm_control_panel device conditions (#95250)

Browse Source
This commit is contained in:
Erik Montnemery 2023-06-26 18:26:21 +02:00 committed by GitHub
parent a64940cf42
commit 07936884a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 73 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
homeassistant/components/alarm_control_panel/device_condition.py
View File

@ -58,7 +58,7 @@ CONDITION_TYPES: Final[set[str]] = {
CONDITION_SCHEMA: Final = DEVICE_CONDITION_BASE_SCHEMA.extend( CONDITION_SCHEMA: Final = 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),
} }
) )
@ -83,7 +83,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 += [ conditions += [
@ -126,8 +126,11 @@ def async_condition_from_config(
elif config[CONF_TYPE] == CONDITION_ARMED_CUSTOM_BYPASS: elif config[CONF_TYPE] == CONDITION_ARMED_CUSTOM_BYPASS:
state = STATE_ALARM_ARMED_CUSTOM_BYPASS state = STATE_ALARM_ARMED_CUSTOM_BYPASS
registry = er.async_get(hass)
entity_id = er.async_resolve_entity_id(registry, config[ATTR_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."""
return condition.state(hass, config[ATTR_ENTITY_ID], state) return condition.state(hass, entity_id, state)
return test_is_state return test_is_state

87
tests/components/alarm_control_panel/test_device_condition.py
View File

@ -93,7 +93,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, DOMAIN,
"test", "test",
"5678", "5678",
@ -114,7 +114,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 basic_condition_types for condition in basic_condition_types
@ -125,7 +125,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 expected_condition_types for condition in expected_condition_types
@ -159,7 +159,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",
@ -173,7 +173,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_disarmed", "is_triggered"] for condition in ["is_disarmed", "is_triggered"]
@ -184,8 +184,12 @@ 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: list[ServiceCall]) -> None: async def test_if_state(
hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
) -> None:
"""Test for all conditions.""" """Test for all conditions."""
entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
assert await async_setup_component( assert await async_setup_component(
hass, hass,
automation.DOMAIN, automation.DOMAIN,
@ -198,7 +202,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
"condition": "device", "condition": "device",
"domain": DOMAIN, "domain": DOMAIN,
"device_id": "", "device_id": "",
"entity_id": "alarm_control_panel.entity", "entity_id": entry.id,
"type": "is_triggered", "type": "is_triggered",
} }
], ],
@ -220,7 +224,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
"condition": "device", "condition": "device",
"domain": DOMAIN, "domain": DOMAIN,
"device_id": "", "device_id": "",
"entity_id": "alarm_control_panel.entity", "entity_id": entry.id,
"type": "is_disarmed", "type": "is_disarmed",
} }
], ],
@ -242,7 +246,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
"condition": "device", "condition": "device",
"domain": DOMAIN, "domain": DOMAIN,
"device_id": "", "device_id": "",
"entity_id": "alarm_control_panel.entity", "entity_id": entry.id,
"type": "is_armed_home", "type": "is_armed_home",
} }
], ],
@ -264,7 +268,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
"condition": "device", "condition": "device",
"domain": DOMAIN, "domain": DOMAIN,
"device_id": "", "device_id": "",
"entity_id": "alarm_control_panel.entity", "entity_id": entry.id,
"type": "is_armed_away", "type": "is_armed_away",
} }
], ],
@ -286,7 +290,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
"condition": "device", "condition": "device",
"domain": DOMAIN, "domain": DOMAIN,
"device_id": "", "device_id": "",
"entity_id": "alarm_control_panel.entity", "entity_id": entry.id,
"type": "is_armed_night", "type": "is_armed_night",
} }
], ],
@ -308,7 +312,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
"condition": "device", "condition": "device",
"domain": DOMAIN, "domain": DOMAIN,
"device_id": "", "device_id": "",
"entity_id": "alarm_control_panel.entity", "entity_id": entry.id,
"type": "is_armed_vacation", "type": "is_armed_vacation",
} }
], ],
@ -330,7 +334,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
"condition": "device", "condition": "device",
"domain": DOMAIN, "domain": DOMAIN,
"device_id": "", "device_id": "",
"entity_id": "alarm_control_panel.entity", "entity_id": entry.id,
"type": "is_armed_custom_bypass", "type": "is_armed_custom_bypass",
} }
], ],
@ -348,7 +352,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
] ]
}, },
) )
hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_TRIGGERED) hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
hass.bus.async_fire("test_event1") hass.bus.async_fire("test_event1")
hass.bus.async_fire("test_event2") hass.bus.async_fire("test_event2")
hass.bus.async_fire("test_event3") hass.bus.async_fire("test_event3")
@ -360,7 +364,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
assert len(calls) == 1 assert len(calls) == 1
assert calls[0].data["some"] == "is_triggered - event - test_event1" assert calls[0].data["some"] == "is_triggered - event - test_event1"
hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_DISARMED) hass.states.async_set(entry.entity_id, STATE_ALARM_DISARMED)
hass.bus.async_fire("test_event1") hass.bus.async_fire("test_event1")
hass.bus.async_fire("test_event2") hass.bus.async_fire("test_event2")
hass.bus.async_fire("test_event3") hass.bus.async_fire("test_event3")
@ -372,7 +376,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
assert len(calls) == 2 assert len(calls) == 2
assert calls[1].data["some"] == "is_disarmed - event - test_event2" assert calls[1].data["some"] == "is_disarmed - event - test_event2"
hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_HOME) hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_HOME)
hass.bus.async_fire("test_event1") hass.bus.async_fire("test_event1")
hass.bus.async_fire("test_event2") hass.bus.async_fire("test_event2")
hass.bus.async_fire("test_event3") hass.bus.async_fire("test_event3")
@ -384,7 +388,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
assert len(calls) == 3 assert len(calls) == 3
assert calls[2].data["some"] == "is_armed_home - event - test_event3" assert calls[2].data["some"] == "is_armed_home - event - test_event3"
hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_AWAY) hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_AWAY)
hass.bus.async_fire("test_event1") hass.bus.async_fire("test_event1")
hass.bus.async_fire("test_event2") hass.bus.async_fire("test_event2")
hass.bus.async_fire("test_event3") hass.bus.async_fire("test_event3")
@ -396,7 +400,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
assert len(calls) == 4 assert len(calls) == 4
assert calls[3].data["some"] == "is_armed_away - event - test_event4" assert calls[3].data["some"] == "is_armed_away - event - test_event4"
hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_NIGHT) hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_NIGHT)
hass.bus.async_fire("test_event1") hass.bus.async_fire("test_event1")
hass.bus.async_fire("test_event2") hass.bus.async_fire("test_event2")
hass.bus.async_fire("test_event3") hass.bus.async_fire("test_event3")
@ -408,7 +412,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
assert len(calls) == 5 assert len(calls) == 5
assert calls[4].data["some"] == "is_armed_night - event - test_event5" assert calls[4].data["some"] == "is_armed_night - event - test_event5"
hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_VACATION) hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_VACATION)
hass.bus.async_fire("test_event1") hass.bus.async_fire("test_event1")
hass.bus.async_fire("test_event2") hass.bus.async_fire("test_event2")
hass.bus.async_fire("test_event3") hass.bus.async_fire("test_event3")
@ -420,7 +424,7 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
assert len(calls) == 6 assert len(calls) == 6
assert calls[5].data["some"] == "is_armed_vacation - event - test_event6" assert calls[5].data["some"] == "is_armed_vacation - event - test_event6"
hass.states.async_set("alarm_control_panel.entity", STATE_ALARM_ARMED_CUSTOM_BYPASS) hass.states.async_set(entry.entity_id, STATE_ALARM_ARMED_CUSTOM_BYPASS)
hass.bus.async_fire("test_event1") hass.bus.async_fire("test_event1")
hass.bus.async_fire("test_event2") hass.bus.async_fire("test_event2")
hass.bus.async_fire("test_event3") hass.bus.async_fire("test_event3")
@ -431,3 +435,46 @@ async def test_if_state(hass: HomeAssistant, calls: list[ServiceCall]) -> None:
await hass.async_block_till_done() await hass.async_block_till_done()
assert len(calls) == 7 assert len(calls) == 7
assert calls[6].data["some"] == "is_armed_custom_bypass - event - test_event7" assert calls[6].data["some"] == "is_armed_custom_bypass - event - test_event7"
async def test_if_state_legacy(
hass: HomeAssistant, entity_registry: er.EntityRegistry, calls: list[ServiceCall]
) -> None:
"""Test for all conditions."""
entry = entity_registry.async_get_or_create(DOMAIN, "test", "5678")
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_triggered",
}
],
"action": {
"service": "test.automation",
"data_template": {
"some": (
"is_triggered "
"- {{ trigger.platform }} "
"- {{ trigger.event.event_type }}"
)
},
},
},
]
},
)
hass.states.async_set(entry.entity_id, STATE_ALARM_TRIGGERED)
hass.bus.async_fire("test_event1")
await hass.async_block_till_done()
assert len(calls) == 1
assert calls[0].data["some"] == "is_triggered - event - test_event1"