Update service domain for ifttt from 'alarm_control_panel' to 'ifttt'

homeassistant/components/alarm_control_panel/services.yaml

@@ -80,16 +80,6 @@ alarmdecoder_alarm_toggle_chime:
       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'
-
 elkm1_alarm_arm_vacation:
   description: Arm the ElkM1 in vacation mode.
   fields:

homeassistant/components/ifttt/__init__.py

@@ -23,6 +23,7 @@
 
 CONF_KEY = "key"
 
+SERVICE_PUSH_ALARM_STATE = "push_alarm_state"
 SERVICE_TRIGGER = "trigger"
 
 SERVICE_TRIGGER_SCHEMA = vol.Schema(

homeassistant/components/ifttt/alarm_control_panel.py

@@ -4,8 +4,12 @@
 
 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 @@
 )
 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 @@
     }
 )
 
-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 @@ async def push_state_update(service):
     )
 
 
-class IFTTTAlarmPanel(alarm.AlarmControlPanel):
+class IFTTTAlarmPanel(AlarmControlPanel):
     """Representation of an alarm control panel controlled through IFTTT."""
 
     def __init__(
@@ -148,8 +150,8 @@ def code_format(self):
         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 @@ def set_alarm_state(self, event, state):
         """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

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'
+      example: 'even more data'