From 13ca42e18744fdb9151eafda38821f51f1faa952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20Sandstr=C3=B6m?= <per.j.sandstrom@gmail.com>
Date: Mon, 14 Sep 2015 17:33:43 +0200
Subject: [PATCH] fixes from review

---
 .../components/alarm_control_panel/__init__.py        |  6 +++---
 .../components/alarm_control_panel/verisure.py        | 11 ++++++-----
 homeassistant/components/verisure.py                  |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/homeassistant/components/alarm_control_panel/__init__.py b/homeassistant/components/alarm_control_panel/__init__.py
index f31be44e64f..bf68e35ffe3 100644
--- a/homeassistant/components/alarm_control_panel/__init__.py
+++ b/homeassistant/components/alarm_control_panel/__init__.py
@@ -1,7 +1,7 @@
 """
 homeassistant.components.alarm_control_panel
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Component to interface with various sensors that can be monitored.
+Component to interface with a alarm control panel.
 """
 import logging
 from homeassistant.helpers.entity import Entity
@@ -100,9 +100,9 @@ class AlarmControlPanel(Entity):
         raise NotImplementedError()
 
     def alarm_arm_home(self, code):
-        """ Send pause command. """
+        """ Send arm home command. """
         raise NotImplementedError()
 
     def alarm_arm_away(self, code):
-        """ Send pause command. """
+        """ Send arm away command. """
         raise NotImplementedError()
diff --git a/homeassistant/components/alarm_control_panel/verisure.py b/homeassistant/components/alarm_control_panel/verisure.py
index 52d5a21a8b4..a317428ffcd 100644
--- a/homeassistant/components/alarm_control_panel/verisure.py
+++ b/homeassistant/components/alarm_control_panel/verisure.py
@@ -49,6 +49,12 @@ class VerisureAlarm(alarm.AlarmControlPanel):
     @property
     def state(self):
         """ Returns the state of the device. """
+        return self._state
+
+    def update(self):
+        ''' update alarm status '''
+        verisure.update()
+        
         if verisure.STATUS[self._device][self._id].status == 'unarmed':
             self._state = STATE_ALARM_DISARMED
         elif verisure.STATUS[self._device][self._id].status == 'armedhome':
@@ -59,11 +65,6 @@ class VerisureAlarm(alarm.AlarmControlPanel):
             _LOGGER.error(
                 'Unknown alarm state %s',
                 verisure.STATUS[self._device][self._id].status)
-        return self._state
-
-    def update(self):
-        ''' update alarm status '''
-        verisure.update()
 
     def alarm_disarm(self, code):
         """ Send disarm command. """
diff --git a/homeassistant/components/verisure.py b/homeassistant/components/verisure.py
index 3ae0ec9a7d9..50fd9d6c7a9 100644
--- a/homeassistant/components/verisure.py
+++ b/homeassistant/components/verisure.py
@@ -125,7 +125,7 @@ def setup(hass, config):
     # Load components for the devices in the ISY controller that we support
     for comp_name, discovery in ((('sensor', DISCOVER_SENSORS),
                                   ('switch', DISCOVER_SWITCHES),
-                                  ('alarm', DISCOVER_ALARMS))):
+                                  ('alarm_control_panel', DISCOVER_ALARMS))):
         component = get_component(comp_name)
         _LOGGER.info(config[DOMAIN])
         bootstrap.setup_component(hass, component.DOMAIN, config)