Fix validator for lcn.send_keys service (#24580)

* Fix validator for lcn.send_keys service

* Removed lowercase table names from send_keys and lock_keys validators

* Revert lowercase regex.

* Fixed table name regex.
This commit is contained in:
Andre Lengwenus 2019-06-18 18:04:36 +02:00 committed by Paulus Schoutsen
parent 024ce0e8eb
commit d22c3f13b2

View File

@ -2,9 +2,9 @@
import pypck
import voluptuous as vol
import homeassistant.helpers.config_validation as cv
from homeassistant.const import (
CONF_ADDRESS, CONF_BRIGHTNESS, CONF_STATE, CONF_UNIT_OF_MEASUREMENT)
import homeassistant.helpers.config_validation as cv
from .const import (
CONF_CONNECTIONS, CONF_KEYS, CONF_LED, CONF_OUTPUT, CONF_PCK,
@ -222,7 +222,8 @@ class SendKeys(LcnServiceCall):
"""Sends keys (which executes bound commands)."""
schema = LcnServiceCall.schema.extend({
vol.Required(CONF_KEYS): cv.matches_regex(r'^([a-dA-D][1-8])+$'),
vol.Required(CONF_KEYS): vol.All(
vol.Upper, cv.matches_regex(r'^([A-D][1-8])+$')),
vol.Optional(CONF_STATE, default='hit'):
vol.All(vol.Upper, vol.In(SENDKEYCOMMANDS)),
vol.Optional(CONF_TIME, default=0): vol.All(int, vol.Range(min=0)),
@ -265,7 +266,8 @@ class LockKeys(LcnServiceCall):
"""Lock keys."""
schema = LcnServiceCall.schema.extend({
vol.Optional(CONF_TABLE, default='a'): cv.matches_regex(r'^[a-dA-D]$'),
vol.Optional(CONF_TABLE, default='a'): vol.All(
vol.Upper, cv.matches_regex(r'^[A-D]$')),
vol.Required(CONF_STATE): is_key_lock_states_string,
vol.Optional(CONF_TIME, default=0): vol.All(int, vol.Range(min=0)),
vol.Optional(CONF_TIME_UNIT, default='s'): vol.All(vol.Upper,