From 2d2ab452ca9c5fba5355bd0e641743a4b3c5ab5c Mon Sep 17 00:00:00 2001
From: Raman Gupta <7243222+raman325@users.noreply.github.com>
Date: Wed, 27 Nov 2019 05:27:48 -0500
Subject: [PATCH] update envisalink service domain (#29126)

---
 .../components/alarm_control_panel/services.yaml   | 10 ----------
 .../components/envisalink/alarm_control_panel.py   | 14 +++++++++-----
 homeassistant/components/envisalink/services.yaml  | 10 ++++++++++
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/homeassistant/components/alarm_control_panel/services.yaml b/homeassistant/components/alarm_control_panel/services.yaml
index 917600862e3..9cd964141c3 100644
--- a/homeassistant/components/alarm_control_panel/services.yaml
+++ b/homeassistant/components/alarm_control_panel/services.yaml
@@ -60,16 +60,6 @@ alarm_trigger:
       description: An optional code to trigger the alarm control panel with.
       example: 1234
 
-envisalink_alarm_keypress:
-  description: Send custom keypresses to the alarm.
-  fields:
-    entity_id:
-      description: Name of the alarm control panel to trigger.
-      example: 'alarm_control_panel.downstairs'
-    keypress:
-      description: 'String to send to the alarm panel (1-6 characters).'
-      example: '*71'
-
 alarmdecoder_alarm_toggle_chime:
   description: Send the alarm the toggle chime command.
   fields:
diff --git a/homeassistant/components/envisalink/alarm_control_panel.py b/homeassistant/components/envisalink/alarm_control_panel.py
index 19703297ccd..00f39bece9f 100644
--- a/homeassistant/components/envisalink/alarm_control_panel.py
+++ b/homeassistant/components/envisalink/alarm_control_panel.py
@@ -3,7 +3,10 @@ import logging
 
 import voluptuous as vol
 
-import homeassistant.components.alarm_control_panel as alarm
+from homeassistant.components.alarm_control_panel import (
+    AlarmControlPanel,
+    FORMAT_NUMBER,
+)
 from homeassistant.components.alarm_control_panel.const import (
     SUPPORT_ALARM_ARM_AWAY,
     SUPPORT_ALARM_ARM_HOME,
@@ -29,6 +32,7 @@ from . import (
     CONF_PANIC,
     CONF_PARTITIONNAME,
     DATA_EVL,
+    DOMAIN,
     PARTITION_SCHEMA,
     SIGNAL_KEYPAD_UPDATE,
     SIGNAL_PARTITION_UPDATE,
@@ -37,7 +41,7 @@ from . import (
 
 _LOGGER = logging.getLogger(__name__)
 
-SERVICE_ALARM_KEYPRESS = "envisalink_alarm_keypress"
+SERVICE_ALARM_KEYPRESS = "alarm_keypress"
 ATTR_KEYPRESS = "keypress"
 ALARM_KEYPRESS_SCHEMA = vol.Schema(
     {
@@ -83,7 +87,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
             device.async_alarm_keypress(keypress)
 
     hass.services.async_register(
-        alarm.DOMAIN,
+        DOMAIN,
         SERVICE_ALARM_KEYPRESS,
         alarm_keypress_handler,
         schema=ALARM_KEYPRESS_SCHEMA,
@@ -92,7 +96,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     return True
 
 
-class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel):
+class EnvisalinkAlarm(EnvisalinkDevice, AlarmControlPanel):
     """Representation of an Envisalink-based alarm panel."""
 
     def __init__(
@@ -124,7 +128,7 @@ class EnvisalinkAlarm(EnvisalinkDevice, alarm.AlarmControlPanel):
         """Regex for code format or None if no code is required."""
         if self._code:
             return None
-        return alarm.FORMAT_NUMBER
+        return FORMAT_NUMBER
 
     @property
     def state(self):
diff --git a/homeassistant/components/envisalink/services.yaml b/homeassistant/components/envisalink/services.yaml
index e31aa804059..2a5f91791df 100644
--- a/homeassistant/components/envisalink/services.yaml
+++ b/homeassistant/components/envisalink/services.yaml
@@ -1,5 +1,15 @@
 # Describes the format for available Envisalink services.
 
+alarm_keypress:
+  description: Send custom keypresses to the alarm.
+  fields:
+    entity_id:
+      description: Name of the alarm control panel to trigger.
+      example: 'alarm_control_panel.downstairs'
+    keypress:
+      description: 'String to send to the alarm panel (1-6 characters).'
+      example: '*71'
+
 invoke_custom_function:
   description: >
     Allows users with DSC panels to trigger a PGM output (1-4).