From 8ef8a314df6c8f6be02db3f7caee44581cae927e Mon Sep 17 00:00:00 2001 From: Raman Gupta <7243222+raman325@users.noreply.github.com> Date: Wed, 27 Nov 2019 12:17:56 -0500 Subject: [PATCH] Update service domain for ifttt from 'alarm_control_panel' to 'ifttt' (#29129) * update service domain for ifttt * update missed variable references --- .../alarm_control_panel/services.yaml | 10 ---------- homeassistant/components/ifttt/__init__.py | 1 + .../components/ifttt/alarm_control_panel.py | 20 ++++++++++--------- homeassistant/components/ifttt/services.yaml | 11 +++++++++- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/homeassistant/components/alarm_control_panel/services.yaml b/homeassistant/components/alarm_control_panel/services.yaml index 9cd964141c3..4b8f54c3d17 100644 --- a/homeassistant/components/alarm_control_panel/services.yaml +++ b/homeassistant/components/alarm_control_panel/services.yaml @@ -69,13 +69,3 @@ alarmdecoder_alarm_toggle_chime: code: description: A required code to toggle the alarm control panel chime with. example: 1234 - -ifttt_push_alarm_state: - description: Update the alarm state to the specified value. - fields: - entity_id: - description: Name of the alarm control panel which state has to be updated. - example: 'alarm_control_panel.downstairs' - state: - description: The state to which the alarm control panel has to be set. - example: 'armed_night' diff --git a/homeassistant/components/ifttt/__init__.py b/homeassistant/components/ifttt/__init__.py index 05d773e9fd6..362b01bb5d8 100644 --- a/homeassistant/components/ifttt/__init__.py +++ b/homeassistant/components/ifttt/__init__.py @@ -23,6 +23,7 @@ ATTR_VALUE3 = "value3" CONF_KEY = "key" +SERVICE_PUSH_ALARM_STATE = "push_alarm_state" SERVICE_TRIGGER = "trigger" SERVICE_TRIGGER_SCHEMA = vol.Schema( diff --git a/homeassistant/components/ifttt/alarm_control_panel.py b/homeassistant/components/ifttt/alarm_control_panel.py index f740cc8ccc9..9c9ec88ccc7 100644 --- a/homeassistant/components/ifttt/alarm_control_panel.py +++ b/homeassistant/components/ifttt/alarm_control_panel.py @@ -4,8 +4,12 @@ import re import voluptuous as vol -import homeassistant.components.alarm_control_panel as alarm -from homeassistant.components.alarm_control_panel import DOMAIN, PLATFORM_SCHEMA +from homeassistant.components.alarm_control_panel import ( + AlarmControlPanel, + FORMAT_NUMBER, + FORMAT_TEXT, +) +from homeassistant.components.alarm_control_panel import PLATFORM_SCHEMA from homeassistant.components.alarm_control_panel.const import ( SUPPORT_ALARM_ARM_AWAY, SUPPORT_ALARM_ARM_HOME, @@ -24,7 +28,7 @@ from homeassistant.const import ( ) import homeassistant.helpers.config_validation as cv -from . import ATTR_EVENT, DOMAIN as IFTTT_DOMAIN, SERVICE_TRIGGER +from . import ATTR_EVENT, DOMAIN, SERVICE_PUSH_ALARM_STATE, SERVICE_TRIGGER _LOGGER = logging.getLogger(__name__) @@ -60,8 +64,6 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( } ) -SERVICE_PUSH_ALARM_STATE = "ifttt_push_alarm_state" - PUSH_ALARM_STATE_SERVICE_SCHEMA = vol.Schema( {vol.Required(ATTR_ENTITY_ID): cv.entity_ids, vol.Required(ATTR_STATE): cv.string} ) @@ -106,7 +108,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None): ) -class IFTTTAlarmPanel(alarm.AlarmControlPanel): +class IFTTTAlarmPanel(AlarmControlPanel): """Representation of an alarm control panel controlled through IFTTT.""" def __init__( @@ -148,8 +150,8 @@ class IFTTTAlarmPanel(alarm.AlarmControlPanel): if self._code is None: return None if isinstance(self._code, str) and re.search("^\\d+$", self._code): - return alarm.FORMAT_NUMBER - return alarm.FORMAT_TEXT + return FORMAT_NUMBER + return FORMAT_TEXT def alarm_disarm(self, code=None): """Send disarm command.""" @@ -179,7 +181,7 @@ class IFTTTAlarmPanel(alarm.AlarmControlPanel): """Call the IFTTT trigger service to change the alarm state.""" data = {ATTR_EVENT: event} - self.hass.services.call(IFTTT_DOMAIN, SERVICE_TRIGGER, data) + self.hass.services.call(DOMAIN, SERVICE_TRIGGER, data) _LOGGER.debug("Called IFTTT integration to trigger event %s", event) if self._optimistic: self._state = state diff --git a/homeassistant/components/ifttt/services.yaml b/homeassistant/components/ifttt/services.yaml index 8669bc07fb4..693c654f258 100644 --- a/homeassistant/components/ifttt/services.yaml +++ b/homeassistant/components/ifttt/services.yaml @@ -1,5 +1,14 @@ # Describes the format for available ifttt services +push_alarm_state: + description: Update the alarm state to the specified value. + fields: + entity_id: + description: Name of the alarm control panel which state has to be updated. + example: 'alarm_control_panel.downstairs' + state: + description: The state to which the alarm control panel has to be set. + example: 'armed_night' trigger: description: Triggers the configured IFTTT Webhook. @@ -15,4 +24,4 @@ trigger: example: 'some additional data' value3: description: Generic field to send data via the event. - example: 'even more data' \ No newline at end of file + example: 'even more data'