evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update service domain for elkm1 from 'alarm_control_panel' to 'elkm1' (#29128)

Browse source 
* move elkm1 services to elkm1 domain

* update missed variable references
This commit is contained in:
Raman Gupta 2019-11-27 05:15:27 -05:00 • committed by Pascal Vizeli
parent b7896c7b6f
commit 975ee0ea7f
4 changed files with 86 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

35
homeassistant/components/elkm1/alarm_control_panel.py
View file

@ -2,7 +2,10 @@
from elkm1_lib.const import AlarmState, ArmedStatus, ArmLevel, ArmUpState
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,
@ -25,7 +28,15 @@ from homeassistant.helpers.dispatcher import (
async_dispatcher_send,
)
from . import DOMAIN as ELK_DOMAIN, ElkEntity, create_elk_entities
from . import (
create_elk_entities,
DOMAIN,
ElkEntity,
SERVICE_ALARM_ARM_HOME_INSTANT,
SERVICE_ALARM_ARM_NIGHT_INSTANT,
SERVICE_ALARM_ARM_VACATION,
SERVICE_ALARM_DISPLAY_MESSAGE,
)
SIGNAL_ARM_ENTITY = "elkm1_arm"
SIGNAL_DISPLAY_MESSAGE = "elkm1_display_message"
@ -56,7 +67,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
if discovery_info is None:
return
elk_datas = hass.data[ELK_DOMAIN]
elk_datas = hass.data[DOMAIN]
entities = []
for elk_data in elk_datas.values():
elk = elk_data["elk"]
@ -75,7 +86,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
for service in _arm_services():
hass.services.async_register(
alarm.DOMAIN, service, _arm_service, ELK_ALARM_SERVICE_SCHEMA
DOMAIN, service, _arm_service, ELK_ALARM_SERVICE_SCHEMA
)
def _display_message_service(service):
@ -91,8 +102,8 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
_dispatch(SIGNAL_DISPLAY_MESSAGE, entity_ids, *args)
hass.services.async_register(
alarm.DOMAIN,
"elkm1_alarm_display_message",
DOMAIN,
SERVICE_ALARM_DISPLAY_MESSAGE,
_display_message_service,
DISPLAY_MESSAGE_SERVICE_SCHEMA,
)
@ -100,13 +111,13 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
def _arm_services():
return {
"elkm1_alarm_arm_vacation": ArmLevel.ARMED_VACATION.value,
"elkm1_alarm_arm_home_instant": ArmLevel.ARMED_STAY_INSTANT.value,
"elkm1_alarm_arm_night_instant": ArmLevel.ARMED_NIGHT_INSTANT.value,
SERVICE_ALARM_ARM_VACATION: ArmLevel.ARMED_VACATION.value,
SERVICE_ALARM_ARM_HOME_INSTANT: ArmLevel.ARMED_STAY_INSTANT.value,
SERVICE_ALARM_ARM_NIGHT_INSTANT: ArmLevel.ARMED_NIGHT_INSTANT.value,
}
class ElkArea(ElkEntity, alarm.AlarmControlPanel):
class ElkArea(ElkEntity, AlarmControlPanel):
"""Representation of an Area / Partition within the ElkM1 alarm panel."""
def __init__(self, element, elk, elk_data):
@ -133,7 +144,7 @@ class ElkArea(ElkEntity, alarm.AlarmControlPanel):
if keypad.area != self._element.index:
return
if changeset.get("last_user") is not None:
self._changed_by_entity_id = self.hass.data[ELK_DOMAIN][self._prefix][
self._changed_by_entity_id = self.hass.data[DOMAIN][self._prefix][
"keypads"
].get(keypad.index, "")
self.async_schedule_update_ha_state(True)
@ -141,7 +152,7 @@ class ElkArea(ElkEntity, alarm.AlarmControlPanel):
@property
def code_format(self):
"""Return the alarm code format."""
return alarm.FORMAT_NUMBER
return FORMAT_NUMBER
@property
def state(self):