jeena/home-assistant
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Allow 'all' entity_id in service schema (#20278)

Browse source
This commit is contained in:
Anders Melchiorsen 2019-01-21 01:33:39 +01:00 • committed by Paulus Schoutsen
parent 1218127d83
commit 62844e237c
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
homeassistant/helpers/config_validation.py
View file

@ -517,7 +517,7 @@ SERVICE_SCHEMA = vol.All(vol.Schema({
vol.Exclusive('service_template', 'service name'): template, vol.Exclusive('service_template', 'service name'): template,
vol.Optional('data'): dict, vol.Optional('data'): dict,
vol.Optional('data_template'): {match_all: template_complex}, vol.Optional('data_template'): {match_all: template_complex},
vol.Optional(CONF_ENTITY_ID): entity_ids, vol.Optional(CONF_ENTITY_ID): comp_entity_ids,
}), has_at_least_one_key('service', 'service_template')) }), has_at_least_one_key('service', 'service_template'))
NUMERIC_STATE_CONDITION_SCHEMA = vol.All(vol.Schema({ NUMERIC_STATE_CONDITION_SCHEMA = vol.All(vol.Schema({

4
tests/helpers/test_config_validation.py
View file

@ -332,6 +332,10 @@ def test_service_schema():
'service': 'homeassistant.turn_on', 'service': 'homeassistant.turn_on',
'entity_id': 'light.kitchen', 'entity_id': 'light.kitchen',
}, },
{
'service': 'light.turn_on',
'entity_id': 'all',
},
{ {
'service': 'homeassistant.turn_on', 'service': 'homeassistant.turn_on',
'entity_id': ['light.kitchen', 'light.ceiling'], 'entity_id': ['light.kitchen', 'light.ceiling'],