MQTT Alarm Control Panel to have all available states

home-assistant · Mar 6, 2020 · caf63ec · caf63ec
1 parent 3b75fdc
commit caf63ec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/homeassistant/components/mqtt/alarm_control_panel.py b/homeassistant/components/mqtt/alarm_control_panel.py
@@ -16,11 +16,14 @@
     CONF_DEVICE,
     CONF_NAME,
     CONF_VALUE_TEMPLATE,
-    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_DISARMED,
     STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_AWAY,
     STATE_ALARM_ARMED_NIGHT,
-    STATE_ALARM_DISARMED,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
     STATE_ALARM_PENDING,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMING,
     STATE_ALARM_TRIGGERED,
 )
 from homeassistant.core import callback
@@ -179,7 +182,10 @@ def message_received(msg):
                 STATE_ALARM_ARMED_HOME,
                 STATE_ALARM_ARMED_AWAY,
                 STATE_ALARM_ARMED_NIGHT,
+                STATE_ALARM_ARMED_CUSTOM_BYPASS,
                 STATE_ALARM_PENDING,
+                STATE_ALARM_ARMING,
+                STATE_ALARM_DISARMING,
                 STATE_ALARM_TRIGGERED,
             ):
                 _LOGGER.warning("Received unexpected payload: %s", msg.payload)

diff --git a/tests/components/mqtt/test_alarm_control_panel.py b/tests/components/mqtt/test_alarm_control_panel.py
@@ -5,11 +5,14 @@
 from homeassistant.components import alarm_control_panel, mqtt
 from homeassistant.components.mqtt.discovery import async_start
 from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_DISARMED,
     STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_ARMED_AWAY,
     STATE_ALARM_ARMED_NIGHT,
-    STATE_ALARM_DISARMED,
+    STATE_ALARM_ARMED_CUSTOM_BYPASS,
     STATE_ALARM_PENDING,
+    STATE_ALARM_ARMING,
+    STATE_ALARM_DISARMING,
     STATE_ALARM_TRIGGERED,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
@@ -83,7 +86,10 @@ async def test_update_state_via_state_topic(hass, mqtt_mock):
         STATE_ALARM_ARMED_HOME,
         STATE_ALARM_ARMED_AWAY,
         STATE_ALARM_ARMED_NIGHT,
+        STATE_ALARM_ARMED_CUSTOM_BYPASS,
         STATE_ALARM_PENDING,
+        STATE_ALARM_ARMING,
+        STATE_ALARM_DISARMING,
         STATE_ALARM_TRIGGERED,
     ):
         async_fire_mqtt_message(hass, "alarm/state", state)